bit of cleaning

[drnoksnes] / Makefile

diff --git a/Makefile b/Makefile
index 2b8efa4..38cb343 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,6 @@ LDLIBS := -lz $(shell sdl-config --libs) $(shell pkg-config --libs x11) -lpopt
 
 # Sane defaults
 CONF_GUI?=1
-# Use Hildon Games Wrapper library
-CONF_HGW?=$(CONF_GUI)
 ifeq ($(ARCH),armel)
        CONF_BUILD_ASM_CPU?=1
        CONF_BUILD_ASM_SPC700?=1
@@ -66,12 +64,18 @@ ifeq ($(CONF_XSP), 1)
 endif
 ifeq ($(CONF_HD), 1)
        CPPFLAGS += -DCONF_HD=1
-       OBJS += platform/sdlvhildon.o
+       LDLIBS += -lSDL_haa
+       CONF_EXIT_BUTTON ?= 1
 endif
-ifeq ($(CONF_HGW), 1)
-       CPPFLAGS += -DCONF_HGW=1 -I/usr/include/hgw
-       LDLIBS += -lhgw
-       OBJS += platform/hgw.o
+ifeq ($(CONF_GUI), 1)
+       CPPFLAGS += -DCONF_GUI=1 $(shell pkg-config --cflags libosso gconf-2.0)
+       LDLIBS += $(shell pkg-config --libs libosso gconf-2.0)
+       OBJS += platform/osso.o
+endif
+ifeq ($(CONF_EXIT_BUTTON), 1)
+       CPPFLAGS += -DCONF_EXIT_BUTTON=1
+       LDLIBS += -lSDL_image
+       OBJS += platform/sdlvexit.o
 endif
 
 # automatic dependencies