X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=ebda569801cbd78d74258d152261c02c159c5d49;hb=c7acb4e6653a19143baefad2ba376b5b5e89b235;hp=ba45765c4e388ef43f0fcc45cefdc92f1627da3f;hpb=fe8200456cf516e08e89aa7e5672471c11df15ce;p=drnoksnes

diff --git a/Makefile b/Makefile
index ba45765..ebda569 100644
--- a/Makefile
+++ b/Makefile
@@ -7,20 +7,28 @@ LDLIBS := -lz $(shell sdl-config --libs) $(shell pkg-config --libs x11) -lpopt
 
 # Sane defaults
 CONF_GUI?=1
-CONF_HGW?=$(CONF_GUI)
 ifeq ($(ARCH),armel)
 	CONF_BUILD_ASM_CPU?=1
 	CONF_BUILD_ASM_SPC700?=1
 	CONF_BUILD_ASM_SA1?=0	# Still not there
-	CONF_XSP?=1
 	CONF_BUILD_MISC_ROUTINES?=misc_armel
 else ifeq ($(ARCH),i386)
 	CONF_BUILD_ASM_CPU?=0
 	CONF_BUILD_ASM_SPC700?=0
-	CONF_BUILD_ASM_SA1?=0	# Still not there
-	CONF_XSP?=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
@@ -46,11 +54,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
-
 OBJS += $(CONF_BUILD_MISC_ROUTINES).o
 
 # from open-whatever sdk
@@ -60,11 +63,31 @@ OBJS += hacks.o
 # the glue code that sticks it all together in a monstruous way
 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_HGW), 1)
-	CPPFLAGS += -DCONF_HGW=1 -I/usr/include/hgw
-	LDLIBS += -lhgw
-	OBJS += platform/hgw.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_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
@@ -75,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
 
@@ -110,5 +134,12 @@ clean: gui_clean
 install: gui_install
 endif
 
-.PHONY: all clean remake deps install gui gui_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