From b19cf62c63fd729a1faba7c7a978d11480ea99f5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 26 May 2014 18:44:24 +0200 Subject: [PATCH] (Makefile) Make menu common code less dependent on HAVE_RGUI switch --- Makefile | 6 +++--- Makefile.emscripten | 4 ++-- Makefile.win | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index cd817815e5..d9ad026222 100644 --- a/Makefile +++ b/Makefile @@ -100,8 +100,8 @@ ifneq ($(findstring Linux,$(OS)),) endif ifeq ($(HAVE_RGUI), 1) - OBJ += frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o - DEFINES += -DHAVE_MENU + OBJ += frontend/menu/disp/rgui.o + DEFINES += -DHAVE_MENU -DHAVE_RGUI HAVE_MENU_COMMON = 1 ifeq ($(HAVE_LAKKA), 1) OBJ += frontend/menu/backend/menu_lakka_backend.o frontend/menu/disp/lakka.o @@ -111,7 +111,7 @@ endif endif ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o + 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/file_list.o frontend/menu/history.o endif ifeq ($(HAVE_THREADS), 1) diff --git a/Makefile.emscripten b/Makefile.emscripten index 7227b69846..f1fef5cecc 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -75,12 +75,12 @@ endif ifeq ($(HAVE_RGUI), 1) DEFINES += -DHAVE_MENU -DHAVE_RGUI - OBJ += frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o + OBJ += frontend/menu/disp/rgui.o HAVE_MENU_COMMON = 1 endif ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o + 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/file_list.o frontend/menu/history.o endif ifeq ($(HAVE_SDL), 1) diff --git a/Makefile.win b/Makefile.win index cd6af8730a..6d01103a75 100644 --- a/Makefile.win +++ b/Makefile.win @@ -120,12 +120,12 @@ JLIBS = ifeq ($(HAVE_RGUI), 1) DEFINES += -DHAVE_RGUI -DHAVE_MENU - OBJ += frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o + OBJ += frontend/menu/disp/rgui.o HAVE_MENU_COMMON = 1 endif ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o + 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/file_list.o frontend/menu/history.o endif ifeq ($(HAVE_SDL), 1)