From 0746337a3428428cddbd5654347397600e8fff93 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 Sep 2014 00:53:00 +0200 Subject: [PATCH] Move menu files to Makefile.common --- Makefile | 23 ----------------------- Makefile.common | 23 +++++++++++++++++++++++ Makefile.emscripten | 15 --------------- Makefile.win | 24 ------------------------ 4 files changed, 23 insertions(+), 62 deletions(-) diff --git a/Makefile b/Makefile index c455f533d8..e0ca91eaa9 100644 --- a/Makefile +++ b/Makefile @@ -67,32 +67,9 @@ ifneq ($(findstring Linux,$(OS)),) JOYCONFIG_OBJ += tools/linuxraw_joypad.o endif -ifeq ($(HAVE_RGUI), 1) - OBJ += frontend/menu/disp/rgui.o - DEFINES += -DHAVE_MENU -DHAVE_RGUI - HAVE_MENU_COMMON = 1 -ifeq ($(HAVE_GLUI), 1) - OBJ += frontend/menu/disp/glui.o - DEFINES += -DHAVE_GLUI -endif -ifeq ($(HAVE_LAKKA), 1) - OBJ += frontend/menu/backend/menu_lakka_backend.o frontend/menu/disp/lakka.o - DEFINES += -DHAVE_LAKKA -endif -endif - OBJ += playlist.o \ movie.o -ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o \ - frontend/menu/menu_input_line_cb.o \ - frontend/menu/menu_common.o \ - frontend/menu/menu_navigation.o \ - frontend/menu/menu_action.o \ - frontend/menu/menu_entries.o -endif - ifeq ($(HAVE_THREADS), 1) OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/thread_wrapper.o ifeq ($(findstring Haiku,$(OS)),) diff --git a/Makefile.common b/Makefile.common index 973c339749..6e7228c3d8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -46,3 +46,26 @@ OBJ += frontend/frontend.o \ input/nullinput.o \ input/osk/nullosk.o \ performance.o + +ifeq ($(HAVE_RGUI), 1) + OBJ += frontend/menu/disp/rgui.o + DEFINES += -DHAVE_MENU -DHAVE_RGUI + HAVE_MENU_COMMON = 1 +ifeq ($(HAVE_GLUI), 1) + OBJ += frontend/menu/disp/glui.o + DEFINES += -DHAVE_GLUI +endif +ifeq ($(HAVE_LAKKA), 1) + OBJ += frontend/menu/backend/menu_lakka_backend.o frontend/menu/disp/lakka.o + DEFINES += -DHAVE_LAKKA +endif +endif + +ifeq ($(HAVE_MENU_COMMON), 1) + OBJ += frontend/menu/backend/menu_common_backend.o \ + frontend/menu/menu_input_line_cb.o \ + frontend/menu/menu_common.o \ + frontend/menu/menu_navigation.o \ + frontend/menu/menu_action.o \ + frontend/menu/menu_entries.o +endif diff --git a/Makefile.emscripten b/Makefile.emscripten index 53991d52bc..db5cb1d60a 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -30,23 +30,8 @@ libretro = libretro_emscripten.bc LIBS = LDFLAGS = -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy -ifeq ($(HAVE_RGUI), 1) - DEFINES += -DHAVE_MENU -DHAVE_RGUI - OBJ += frontend/menu/disp/rgui.o - HAVE_MENU_COMMON = 1 -endif - OBJ += playlist.o -ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o \ - frontend/menu/menu_input_line_cb.o \ - frontend/menu/menu_common.o \ - frontend/menu/menu_navigation.o \ - frontend/menu/menu_action.o \ - frontend/menu/menu_entries.o -endif - ifeq ($(HAVE_SDL), 1) OBJ += input/sdl_input.o LIBS += -lSDL diff --git a/Makefile.win b/Makefile.win index e35fc273ad..5c6e2b646f 100644 --- a/Makefile.win +++ b/Makefile.win @@ -76,32 +76,8 @@ ifeq ($(SCALER_NO_SIMD), 1) DEFINES += -DSCALER_NO_SIMD endif - -ifeq ($(HAVE_RGUI), 1) - OBJ += frontend/menu/disp/rgui.o - DEFINES += -DHAVE_MENU -DHAVE_RGUI - HAVE_MENU_COMMON = 1 -ifeq ($(HAVE_GLUI), 1) - OBJ += frontend/menu/disp/glui.o - DEFINES += -DHAVE_GLUI -endif -ifeq ($(HAVE_LAKKA), 1) - OBJ += frontend/menu/backend/menu_lakka_backend.o frontend/menu/disp/lakka.o - DEFINES += -DHAVE_LAKKA -endif -endif - OBJ += playlist.o -ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o \ - frontend/menu/menu_input_line_cb.o \ - frontend/menu/menu_common.o \ - frontend/menu/menu_navigation.o \ - frontend/menu/menu_action.o \ - frontend/menu/menu_entries.o -endif - ifeq ($(HAVE_SDL2), 1) OBJ += gfx/sdl2_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o