libretro: rework makefile

diff --git a/Makefile b/Makefile
index 5b2bef7..a472492 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


@@ -228,13 +234,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

diff --git a/Makefile.libretro b/Makefile.libretro
index f006409..bb07fc3 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,16 +1,5 @@
 # Makefile for PCSX ReARMed (libretro)
 
 # Makefile for PCSX ReARMed (libretro)
 

-# default stuff goes here, so that config can override
-CFLAGS += -Wall -ggdb -Iinclude -ffast-math
-ifndef DEBUG
-CFLAGS += -O2 -DNDEBUG
-endif
-CXXFLAGS += $(CFLAGS)
-#DRC_DBG = 1
-#PCNT = 1
-
-all: target_ plugins_
-

 ifeq ($(platform),)
 platform = unix
 ifeq ($(shell uname -a),)
 ifeq ($(platform),)
 platform = unix
 ifeq ($(shell uname -a),)


@@ -43,12 +32,15 @@ ARCH := arm
    fpic := -fPIC
    SHARED := -dynamiclib
 
    fpic := -fPIC
    SHARED := -dynamiclib
 

-CC = clang -arch armv7 -isysroot $(IOSSDK)
-CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
-CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
-ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+   CC = clang -arch armv7 -isysroot $(IOSSDK)
+   CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+   CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
+   CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+   ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon

    HAVE_NEON = 1
    HAVE_NEON = 1

+#TODO
+#   BUILTIN_GPU = neon
+#   USE_DYNAREC = 1

    CFLAGS += -DIOS
 else ifeq ($(platform), ps3)
    TARGET := snes9x_next_libretro_ps3.a
    CFLAGS += -DIOS
 else ifeq ($(platform), ps3)
    TARGET := snes9x_next_libretro_ps3.a


@@ -103,160 +95,20 @@ else
    CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
 endif
 
    CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
 endif
 

-CFLAGS +=  -fPIC
-ASFLAGS += 
-LDFLAGS += 
-
+CFLAGS += -fPIC

 ifneq ($(platform),qnx)
    LDLIBS += -lpthread
    MAIN_LDLIBS += -ldl
 endif
 ifneq ($(platform),qnx)
    LDLIBS += -lpthread
    MAIN_LDLIBS += -ldl
 endif

-MAIN_LDFLAGS +=  -shared
+MAIN_LDFLAGS += -shared

 MAIN_LDLIBS += -lm -lz
 MAIN_LDLIBS += -lm -lz

-PLUGIN_CFLAGS +=  -fPIC
+EXTRA_LDFLAGS =

 
 TARGET ?= libretro.so
 PLATFORM = libretro
 BUILTIN_GPU ?= peops
 SOUND_DRIVERS = libretro
 
 TARGET ?= libretro.so
 PLATFORM = libretro
 BUILTIN_GPU ?= peops
 SOUND_DRIVERS = libretro

-#PLUGINS = plugins/dfxvideo/gpu_peops.so plugins/gpu_unai/gpu_unai.so
-
-CC_LINK = $(CC)
-LDFLAGS += $(MAIN_LDFLAGS)
-LDLIBS += $(MAIN_LDLIBS)
-ifdef PCNT
-CFLAGS += -DPCNT
-endif
-
-# core
-OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \
-       libpcsxcore/decode_xa.o libpcsxcore/disr3000a.o libpcsxcore/mdec.o \
-       libpcsxcore/misc.o libpcsxcore/plugins.o libpcsxcore/ppf.o libpcsxcore/psxbios.o \
-       libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o libpcsxcore/psxhle.o \
-       libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \
-       libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o
-OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o
-ifeq "$(ARCH)" "arm"
-OBJS += libpcsxcore/gte_arm.o
-endif
-ifeq "$(HAVE_NEON)" "1"
-OBJS += libpcsxcore/gte_neon.o
-endif
-libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
-
-# dynarec
-ifeq "$(USE_DYNAREC)" "1"
-OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
-OBJS += libpcsxcore/new_dynarec/pcsxmem.o
-else
-libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -DDRC_DISABLE
-endif
-OBJS += libpcsxcore/new_dynarec/emu_if.o
-libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
-       libpcsxcore/new_dynarec/pcsxmem_inline.c
-libpcsxcore/new_dynarec/new_dynarec.o: CFLAGS += -Wno-all -Wno-pointer-sign
-ifdef DRC_DBG
-libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -DDRC_DBG
-endif
-ifeq "$(DRC_CACHE_BASE)" "1"
-libpcsxcore/new_dynarec/%.o: CFLAGS += -DBASE_ADDR_FIXED=1
-endif
-
-# spu
-OBJS += plugins/dfsound/dma.o plugins/dfsound/freeze.o \
-       plugins/dfsound/registers.o plugins/dfsound/spu.o \
-       plugins/dfsound/out.o
-plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
-       plugins/dfsound/xa.c
-ifeq "$(ARCH)" "arm"
-OBJS += plugins/dfsound/arm_utils.o
-endif
-plugins/dfsound/out.o: CFLAGS += -DHAVE_LIBRETRO
-
-# builtin gpu
-OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o
-ifeq "$(BUILTIN_GPU)" "neon"
-OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o
-plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
-plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c
-endif
-ifeq "$(BUILTIN_GPU)" "peops"
-# note: code is not safe for strict-aliasing? (Castlevania problems)
-plugins/dfxvideo/gpulib_if.o: CFLAGS += -fno-strict-aliasing
-plugins/dfxvideo/gpulib_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c
-OBJS += plugins/dfxvideo/gpulib_if.o
-endif
-ifeq "$(BUILTIN_GPU)" "unai"
-OBJS += plugins/gpu_unai/gpulib_if.o
-ifeq "$(ARCH)" "arm"
-OBJS += plugins/gpu_unai/gpu_arm.o
-endif
-plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 
-CC_LINK = $(CXX)
-endif
-
-# cdrcimg
-OBJS += plugins/cdrcimg/cdrcimg.o
-
-# dfinput
-OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
-
-# frontend/gui
-OBJS += frontend/cspace.o
-ifeq "$(HAVE_NEON)" "1"
-OBJS += frontend/cspace_neon.o
-else
-ifeq "$(ARCH)" "arm"
-OBJS += frontend/cspace_arm.o
-endif
-endif
-
-CFLAGS += -DFRONTEND_SUPPORTS_RGB565 -DNO_FRONTEND
-
-# misc
-OBJS += frontend/libretro.o frontend/main.o frontend/plugin.o
-
-
-frontend/menu.o frontend/main.o: frontend/revision.h
-frontend/libretro.o: frontend/revision.h
-
-libpcsxcore/gte_nf.o: libpcsxcore/gte.c
-       $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
-
-frontend/revision.h: FORCE
-       @(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_
-       @diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
-       @rm $@_
-
-%.o: %.S
-       $(CC_AS) $(CFLAGS) -c $^ -o $@
-       
-%.o: %.s
-       $(CC) $(ASFLAGS) -c $^ -o $@
-
-
-target_: $(TARGET)
-
-$(TARGET): $(OBJS)
-       $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map
-
-clean: $(PLAT_CLEAN) clean_plugins
-       $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h
-
-ifneq ($(PLUGINS),)
-plugins_: $(PLUGINS)
-
-$(PLUGINS):
-       make -C $(dir $@)
-
-clean_plugins:
-       make -C plugins/gpulib/ clean
-       for dir in $(PLUGINS) ; do \
-               $(MAKE) -C $$(dirname $$dir) clean; done
-else
-plugins_:
-clean_plugins:
-endif
+PLUGINS =
+NO_CONFIG_MAK = yes

 
 

-.PHONY: all clean target_ plugins_ clean_plugins FORCE
+include Makefile

diff --git a/configure b/configure
index 50378ca..bf704ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -63,7 +63,7 @@ CC="${CC-${CROSS_COMPILE}gcc}"
 CXX="${CXX-${CROSS_COMPILE}g++}"
 AS="${AS-${CROSS_COMPILE}as}"
 AR="${AS-${CROSS_COMPILE}ar}"
 CXX="${CXX-${CROSS_COMPILE}g++}"
 AS="${AS-${CROSS_COMPILE}as}"
 AR="${AS-${CROSS_COMPILE}ar}"

-MAIN_LDLIBS="$LDLIBS -ldl -lm"
+MAIN_LDLIBS="$LDLIBS -ldl -lm -lpthread"

 config_mak="config.mak"
 
 fail()
 config_mak="config.mak"
 
 fail()