cdriso: merge from pcsxr r90558

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index b6f381c..58de43a 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
@@ -54,6 +60,7 @@ OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_ar
 OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 else
 libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -DDRC_DISABLE
+frontend/libretro.o: CFLAGS += -DDRC_DISABLE
 endif
 OBJS += libpcsxcore/new_dynarec/emu_if.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
@@ -129,6 +136,10 @@ OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
 OBJS += frontend/cspace.o
 ifeq "$(HAVE_NEON)" "1"
 OBJS += frontend/cspace_neon.o
+else
+ifeq "$(ARCH)" "arm"
+OBJS += frontend/cspace_arm.o
+endif
 endif
 
 ifeq "$(PLATFORM)" "generic"
@@ -167,13 +178,21 @@ USE_PLUGIN_LIB = 1
 USE_FRONTEND = 1
 endif
 ifeq "$(PLATFORM)" "maemo"
-OBJS += maemo/hildon.o maemo/main.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)
+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
 ifeq "$(PLATFORM)" "libretro"
 OBJS += frontend/libretro.o
 CFLAGS += -DFRONTEND_SUPPORTS_RGB565
+
+ifeq ($(MMAP_WIN32),1)
+OBJS += libpcsxcore/memmap_win32.o
+endif
 endif
 
 ifeq "$(USE_PLUGIN_LIB)" "1"
@@ -220,13 +239,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