fix bug with memory card files being overwritten with RTC files

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index f9004fa..a472492 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 # Makefile for PCSX ReARMed
 
 # default stuff goes here, so that config can override
-TARGET = pcsx
+TARGET ?= pcsx
 CFLAGS += -Wall -ggdb -Iinclude -ffast-math
-LDLIBS += -lpthread
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
@@ -13,6 +12,7 @@ CXXFLAGS += $(CFLAGS)
 
 all: config.mak target_ plugins_
 
+ifndef NO_CONFIG_MAK
 ifneq ($(wildcard config.mak),)
 config.mak: ./configure
        @echo $@ is out-of-date, running configure
@@ -23,10 +23,16 @@ config.mak:
        @echo "Please run ./configure before running make!"
        @exit 1
 endif
+else # NO_CONFIG_MAK
+config.mak:
+endif
+
 -include Makefile.local
 
-CC_LINK = $(CC)
+CC_LINK ?= $(CC)
+CC_AS ?= $(CC)
 LDFLAGS += $(MAIN_LDFLAGS)
+EXTRA_LDFLAGS ?= -Wl,-Map=$@.map
 LDLIBS += $(MAIN_LDLIBS)
 ifdef PCNT
 CFLAGS += -DPCNT
@@ -171,14 +177,11 @@ USE_PLUGIN_LIB = 1
 USE_FRONTEND = 1
 endif
 ifeq "$(PLATFORM)" "maemo"
-OBJS += maemo/hildon.o maemo/main.o maemo/maemo_xkb.o
+OBJS += maemo/hildon.o maemo/main.o maemo/maemo_xkb.o frontend/pl_gun_ts.o
 maemo/%.o: maemo/%.c
 USE_PLUGIN_LIB = 1
 LDFLAGS += $(shell pkg-config --libs hildon-1 libpulse)
-EXTRA_CFLAGS +=  $(shell pkg-config --cflags hildon-1)
-#EXTRA_CFLAGS += -DMAEMO -DMAEMO_CHANGES -march=armv7-a -O3 -mtune=cortex-a8 -mfpu=neon -funsafe-math-optimizations \
-#                -mstructure-size-boundary=32 -falign-functions=32 -falign-loops
-CFLAGS += $(EXTRA_CFLAGS)
+CFLAGS += $(shell pkg-config --cflags hildon-1) -DHAVE_TSLIB
 CFLAGS += `pkg-config --cflags glib-2.0 libosso dbus-1 hildon-fm-2`
 LDFLAGS += `pkg-config --libs glib-2.0 libosso dbus-1 hildon-fm-2`
 endif
@@ -231,13 +234,13 @@ frontend/revision.h: FORCE
        @rm $@_
 
 %.o: %.S
-       $(CC) $(CFLAGS) -c $^ -o $@
+       $(CC_AS) $(CFLAGS) -c $^ -o $@
 
 
 target_: $(TARGET)
 
 $(TARGET): $(OBJS)
-       $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map
+       $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS)
 
 clean: $(PLAT_CLEAN) clean_plugins
        $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h