X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=ebda569801cbd78d74258d152261c02c159c5d49;hb=d9ca4f87ccfc9c17594e8baafde24516c08c80f4;hp=3af4d90f2015671e619cb18f1ede40eef7dbcf8c;hpb=ed0378fbba2197526e02534425ead21101b2e0f9;p=drnoksnes

diff --git a/Makefile b/Makefile
index 3af4d90..ebda569 100644
--- 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
@@ -19,11 +17,18 @@ else ifeq ($(ARCH),i386)
 	CONF_BUILD_ASM_SPC700?=0
 	CONF_BUILD_ASM_SA1?=0
 	CONF_BUILD_MISC_ROUTINES?=misc_i386
+else ifeq ($(ARCH),amd64)
+	CONF_BUILD_ASM_CPU?=0
+	CONF_BUILD_ASM_SPC700?=0
+	CONF_BUILD_ASM_SA1?=0
+	CONF_BUILD_MISC_ROUTINES?=misc_amd64
 endif
 # Hardware pixel doubling (in N8x0)
 CONF_XSP?=0
 # Hildon Desktop compositing (in Fremantle)
 CONF_HD?=0
+# Link to libzeemote
+CONF_ZEEMOTE?=0
 
 # SNES stuff
 OBJS = apu.o c4.o c4emu.o cheats.o cheats2.o clip.o cpu.o cpuexec.o data.o
@@ -66,19 +71,24 @@ 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
+ifeq ($(CONF_ZEEMOTE), 1)
+	CPPFLAGS += -DCONF_ZEEMOTE=1
+	LDLIBS += -lzeemote -lzeemote-conf -lbluetooth
+	OBJS += platform/zeemote.o
+endif
 
 # automatic dependencies
 DEPS := $(OBJS:.o=.d)
@@ -88,6 +98,7 @@ all: drnoksnes
 clean:
 	rm -f drnoksnes *.o *.d platform/*.o platform/*.d
 	rm -f build-stamp configure-stamp
+	echo "$(OBJS)"
 
 remake: clean deps all
 
@@ -123,7 +134,11 @@ clean: gui_clean
 install: gui_install
 endif
 
-distclean: clean
+profclean: clean
+	find . -name '*.gcno' -delete
+	find . -name '*.gcda' -delete
+
+distclean: profclean clean
 	rm -f config.mk
 
 .PHONY: all clean remake deps install gui gui_clean distclean