Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disabled menu buildfixes #17184

Merged
merged 2 commits into from
Nov 14, 2024

Conversation

sonninnos
Copy link
Collaborator

@sonninnos sonninnos commented Nov 13, 2024

No description provided.

@viachaslavic
Copy link
Contributor

This partially close #16880 (comment), not the entire issue.

@sonninnos
Copy link
Collaborator Author

What errors are remaining that prevent the building? Warnings don't count.

@viachaslavic
Copy link
Contributor

  1. Issue with gcc 14 Allow building RetroArch with menu disabled #16881 (comment) , which cannot find the declaration.
  2. Qt handling in build scripts Current RetroArch cannot build with the menu disabled #16880 (comment)

Both cases are not related to #16929 , so It's too early to close linked issue until they are resolved.

@sonninnos
Copy link
Collaborator Author

sonninnos commented Nov 14, 2024

Sure, any kind of thumbnail download task thing makes absolutely zero sense with menu disabled, so the whole file should not be included at all. I saw it sure, but it only warns here.

@viachaslavic
Copy link
Contributor

viachaslavic commented Nov 14, 2024

For successful build, even with overhead, task_pl_thumbnail_download.c can be fixed with a simple including header

diff --git a/tasks/task_pl_thumbnail_download.c b/tasks/task_pl_thumbnail_download.c
index 71b397e87a..359c909200 100644
--- a/tasks/task_pl_thumbnail_download.c
+++ b/tasks/task_pl_thumbnail_download.c
@@ -32,6 +32,7 @@
 #include "../configuration.h"
 #include "../file_path_special.h"
 #include "../playlist.h"
+#include "../runloop.h"
 #include "../verbosity.h"

 #ifdef RARCH_INTERNAL

@sonninnos
Copy link
Collaborator Author

Nice, but let's do this instead

diff --git a/Makefile.common b/Makefile.common
index c73350c8b6..f3ca6f44bc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -336,13 +336,17 @@ OBJ += \
        gfx/video_driver.o \
        gfx/gfx_display.o \
        gfx/gfx_animation.o \
-       gfx/gfx_thumbnail_path.o \
-       gfx/gfx_thumbnail.o \
        configuration.o \
        $(LIBRETRO_COMM_DIR)/dynamic/dylib.o \
        cores/dynamic_dummy.o \
        $(LIBRETRO_COMM_DIR)/queues/message_queue.o

+ifeq ($(HAVE_MENU), 1)
+   OBJ += \
+       gfx/gfx_thumbnail_path.o \
+       gfx/gfx_thumbnail.o
+endif
+
 ifeq ($(HAVE_MICROPHONE), 1)
    DEFINES += -DHAVE_MICROPHONE
    OBJ += audio/microphone_driver.o
@@ -2166,9 +2170,12 @@ ifeq ($(HAVE_NETWORKING), 1)
           tasks/task_http.o \
           tasks/task_netplay_lan_scan.o \
           tasks/task_netplay_nat_traversal.o \
-         tasks/task_pl_thumbnail_download.o \
           tasks/task_netplay_find_content.o

+   ifeq ($(HAVE_MENU), 1)
+      OBJ += tasks/task_pl_thumbnail_download.o
+   endif
+
    ifeq ($(HAVE_MENU_COMMON), 1)
       OBJ += tasks/task_core_updater.o
    endif

@viachaslavic
Copy link
Contributor

viachaslavic commented Nov 14, 2024

Great! Now it compiles correctly and works on Arch, but only with an explicit --disable-qt.
We can leave the issue of transitive includes for a separate discussion in the future.

@LibretroAdmin LibretroAdmin merged commit e09039c into libretro:master Nov 14, 2024
27 checks passed
@sonninnos sonninnos deleted the menu-disabled-buildfix branch November 14, 2024 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants