spu: handle stop better, split main func more

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index 5b2bef7..339fcd5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 # Makefile for PCSX ReARMed
 
 # default stuff goes here, so that config can override
 # Makefile for PCSX ReARMed
 
 # default stuff goes here, so that config can override

-TARGET = pcsx
+TARGET ?= pcsx

 CFLAGS += -Wall -ggdb -Iinclude -ffast-math
 CFLAGS += -Wall -ggdb -Iinclude -ffast-math

-LDLIBS += -lpthread

 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif


@@ -13,6 +12,7 @@ CXXFLAGS += $(CFLAGS)
 
 all: config.mak target_ plugins_
 
 
 all: config.mak target_ plugins_
 

+ifndef NO_CONFIG_MAK

 ifneq ($(wildcard config.mak),)
 config.mak: ./configure
        @echo $@ is out-of-date, running configure
 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
        @echo "Please run ./configure before running make!"
        @exit 1
 endif

+else # NO_CONFIG_MAK
+config.mak:
+endif
+

 -include Makefile.local
 
 -include Makefile.local
 

-CC_LINK = $(CC)
+CC_LINK ?= $(CC)
+CC_AS ?= $(CC)

 LDFLAGS += $(MAIN_LDFLAGS)
 LDFLAGS += $(MAIN_LDFLAGS)

+EXTRA_LDFLAGS ?= -Wl,-Map=$@.map

 LDLIBS += $(MAIN_LDLIBS)
 ifdef PCNT
 CFLAGS += -DPCNT
 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
 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 \
 endif
 OBJS += libpcsxcore/new_dynarec/emu_if.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \


@@ -158,6 +165,7 @@ OBJS += frontend/libpicofe/linux/fbdev.o frontend/libpicofe/linux/xenv.o
 OBJS += frontend/libpicofe/linux/in_evdev.o
 OBJS += frontend/plat_pandora.o frontend/plat_omap.o
 frontend/main.o frontend/menu.o: CFLAGS += -include frontend/pandora/ui_feat.h
 OBJS += frontend/libpicofe/linux/in_evdev.o
 OBJS += frontend/plat_pandora.o frontend/plat_omap.o
 frontend/main.o frontend/menu.o: CFLAGS += -include frontend/pandora/ui_feat.h

+frontend/libpicofe/linux/plat.o: CFLAGS += -DPANDORA

 USE_PLUGIN_LIB = 1
 USE_FRONTEND = 1
 endif
 USE_PLUGIN_LIB = 1
 USE_FRONTEND = 1
 endif


@@ -182,6 +190,10 @@ endif
 ifeq "$(PLATFORM)" "libretro"
 OBJS += frontend/libretro.o
 CFLAGS += -DFRONTEND_SUPPORTS_RGB565
 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"
 endif
 
 ifeq "$(USE_PLUGIN_LIB)" "1"


@@ -228,13 +240,13 @@ frontend/revision.h: FORCE
        @rm $@_
 
 %.o: %.S
        @rm $@_
 
 %.o: %.S

-       $(CC) $(CFLAGS) -c $^ -o $@
+       $(CC_AS) $(CFLAGS) -c $^ -o $@

 
 
 target_: $(TARGET)
 
 $(TARGET): $(OBJS)
 
 
 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
 
 clean: $(PLAT_CLEAN) clean_plugins
        $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h