From 6d59e6fc6ab658ef10606e0bad6590ec98d436cd Mon Sep 17 00:00:00 2001 From: Monroe88 Date: Thu, 11 Sep 2014 20:33:45 -0500 Subject: [PATCH 1/2] Add GLUI building to Makefile.win --- Makefile.win | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.win b/Makefile.win index 0e428ee709..cce26944c0 100644 --- a/Makefile.win +++ b/Makefile.win @@ -88,6 +88,7 @@ HAVE_NETPLAY = 1 HAVE_STDIN_CMD = 1 HAVE_THREADS = 1 HAVE_RGUI = 1 +HAVE_GLUI = 1 HAVE_7ZIP = 1 DYNAMIC = 1 @@ -126,6 +127,10 @@ 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 From 42dd095703cf092a726e8db2fd4f942031e685e0 Mon Sep 17 00:00:00 2001 From: Monroe88 Date: Thu, 11 Sep 2014 20:34:54 -0500 Subject: [PATCH 2/2] Enable Lakka building by default on Makefile.win --- Makefile.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.win b/Makefile.win index cce26944c0..cd6ab9c815 100644 --- a/Makefile.win +++ b/Makefile.win @@ -94,7 +94,7 @@ DYNAMIC = 1 HAVE_WINXINPUT = 1 -HAVE_LAKKA = 0 +HAVE_LAKKA = 1 ifeq ($(SLIM),) HAVE_SDL = 1