X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=e807f911cef69f298a8a0d1694ccc11ce1c8bfd8;hb=637930a378b1e098fab00108f542f8eb1b865488;hp=3a3e373bde6ead32e25f116ebb6c99df296b3b0f;hpb=24cb730f82bbe2b4873e8b59a214c2b1f27d10b3;p=drnoksnes

diff --git a/Makefile b/Makefile
index 3a3e373..e807f91 100644
--- a/Makefile
+++ b/Makefile
@@ -49,15 +49,6 @@ else
 	OBJS += sa1cpu.o
 endif
 
-
-ifeq ($(CONF_XSP), 1)
-	CPPFLAGS += -DCONF_XSP=1 $(shell pkg-config --cflags xsp)
-	LDLIBS += $(shell pkg-config --libs xsp)
-endif
-ifeq ($(CONF_HD), 1)
-	CPPFLAGS += -DCONF_HD=1
-endif
-
 OBJS += $(CONF_BUILD_MISC_ROUTINES).o
 
 # from open-whatever sdk
@@ -69,11 +60,25 @@ OBJS += platform/path.o platform/config.o
 OBJS += platform/sdl.o platform/sdlv.o platform/sdla.o platform/sdli.o
 OBJS += platform/sdlvscalers.o
 
+ifeq ($(CONF_XSP), 1)
+	CPPFLAGS += -DCONF_XSP=1 $(shell pkg-config --cflags xsp)
+	LDLIBS += $(shell pkg-config --libs xsp)
+endif
+ifeq ($(CONF_HD), 1)
+	CPPFLAGS += -DCONF_HD=1
+	LDLIBS += -lSDL_haa
+	CONF_EXIT_BUTTON ?= 1
+endif
 ifeq ($(CONF_HGW), 1)
-	CPPFLAGS += -DCONF_HGW=1 -I/usr/include/hgw
-	LDLIBS += -lhgw
+	CPPFLAGS += -DCONF_HGW=1 -I/usr/include/hgw $(shell pkg-config --cflags gconf-2.0)
+	LDLIBS += -lhgw $(shell pkg-config --libs gconf-2.0)
 	OBJS += platform/hgw.o
 endif
+ifeq ($(CONF_EXIT_BUTTON), 1)
+	CPPFLAGS += -DCONF_EXIT_BUTTON=1
+	LDLIBS += -lSDL_image
+	OBJS += platform/sdlvexit.o
+endif
 
 # automatic dependencies
 DEPS := $(OBJS:.o=.d)