X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=c10f739359a82722e35812e38c9c5e49c573a4b7;hp=d6e968fa94b2b35739eca72693192c21d4270cc1;hb=cb88320b4ddbfd8c1714f9a6cba31543a585a8cd;hpb=3938f69aec45c859104d780df98b10c0977fb144

diff --git a/Makefile b/Makefile
index d6e968fa..c10f7393 100644
--- a/Makefile
+++ b/Makefile
@@ -1,112 +1,173 @@
-#CROSS_COMPILE=
-AS = $(CROSS_COMPILE)as
-CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)ld
+# Makefile for PCSX ReARMed
 
-ARCH = $(shell $(CC) -v 2>&1 | grep -i 'target:' | awk '{print $$2}' | awk -F '-' '{print $$1}')
-
-CFLAGS += -ggdb -Ifrontend
-LDFLAGS += -lz -lpthread -ldl -lpng -lbz2
-ifeq "$(ARCH)" "arm"
-CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -ffast-math
-ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
-endif
+# default stuff goes here, so that config can override
+TARGET = pcsx
+CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
+LDLIBS += -lpthread
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
-CFLAGS += $(EXTRA_CFLAGS)
-
-USE_OSS ?= 1
-#USE_ALSA = 1
+CXXFLAGS += $(CFLAGS)
 #DRC_DBG = 1
 #PCNT = 1
-TARGET = pcsx
 
+all: config.mak target_ plugins_
+
+ifneq ($(wildcard config.mak),)
+config.mak: ./configure
+	@echo $@ is out-of-date, running configure
+	@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
+include config.mak
+else
+config.mak:
+	@echo "Please run ./configure before running make!"
+	@exit 1
+endif
 -include Makefile.local
 
-all: $(TARGET)
+CC_LINK = $(CC)
+LDLIBS += $(MAIN_LDLIBS)
 
 # core
 OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \
-	libpcsxcore/decode_xa.o libpcsxcore/disr3000a.o libpcsxcore/gte.o libpcsxcore/mdec.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/gte.o libpcsxcore/gte_nf.o: CFLAGS += -fno-strict-aliasing
+libpcsxcore/cdrom.o libpcsxcore/misc.o: CFLAGS += -Wno-pointer-sign
+libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
+
 # dynarec
-ifndef NO_NEW_DRC
+ifeq "$(USE_DYNAREC)" "1"
 OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
 OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 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/registers.o plugins/dfsound/spu.o \
+	plugins/dfsound/out.o plugins/dfsound/nullsnd.o
 plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \
 	plugins/dfsound/xa.c
-plugins/dfsound/%.o: CFLAGS += -Wall
-ifeq "$(USE_OSS)" "1"
-plugins/dfsound/%.o: CFLAGS += -DUSEOSS
+ifeq "$(ARCH)" "arm"
+OBJS += plugins/dfsound/arm_utils.o
+endif
+ifneq ($(findstring oss,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_OSS
 OBJS += plugins/dfsound/oss.o
 endif
-ifeq "$(USE_ALSA)" "1"
-plugins/dfsound/%.o: CFLAGS += -DUSEALSA
+ifneq ($(findstring alsa,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_ALSA
 OBJS += plugins/dfsound/alsa.o
-LDFLAGS += -lasound
+LDLIBS += -lasound
+endif
+ifneq ($(findstring sdl,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_SDL
+OBJS += plugins/dfsound/sdl.o
+endif
+ifneq ($(findstring pulseaudio,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_PULSE
+OBJS += plugins/dfsound/pulseaudio.o
+endif
+ifneq ($(findstring libretro,$(SOUND_DRIVERS)),)
+plugins/dfsound/out.o: CFLAGS += -DHAVE_LIBRETRO
 endif
 
-# gpu
-# note: code is not safe for strict-aliasing? (Castlevania problems)
-plugins/dfxvideo/%.o: CFLAGS += -Wall -fno-strict-aliasing
-OBJS += plugins/dfxvideo/gpu.o
-plugins/dfxvideo/gpu.o: plugins/dfxvideo/fps.c plugins/dfxvideo/prim.c \
-	plugins/dfxvideo/gpu.c plugins/dfxvideo/soft.c
-ifdef X11
-LDFLAGS += -lX11 -lXv
-OBJS += plugins/dfxvideo/draw.o
+# builtin gpu
+OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o
+ifeq "$(HAVE_NEON)" "1"
+OBJS += plugins/gpulib/cspace_neon.o
 else
-OBJS += plugins/dfxvideo/draw_fb.o
+OBJS += plugins/gpulib/cspace.o
+endif
+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/gpulib/cspace.o
+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
-plugins/cdrcimg/%.o: CFLAGS += -Wall
 OBJS += plugins/cdrcimg/cdrcimg.o
 
 # dfinput
-plugins/dfinput/%.o: CFLAGS += -Wall
-OBJS += plugins/dfinput/pad.o
+OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
 
 # gui
 OBJS += frontend/main.o frontend/plugin.o
-ifeq "$(USE_GTK)" "1"
+OBJS += frontend/common/readpng.o frontend/common/fonts.o
+OBJS += frontend/linux/plat.o
+
+ifeq "$(PLATFORM)" "generic"
+OBJS += frontend/plat_sdl.o frontend/common/in_sdl.o
+USE_FRONTEND = 1
+endif
+ifeq "$(PLATFORM)" "pandora"
+OBJS += frontend/linux/fbdev.o
+OBJS += frontend/plat_omap.o frontend/linux/xenv.o
+OBJS += frontend/plat_pandora.o
+USE_FRONTEND = 1
+endif
+ifeq "$(PLATFORM)" "caanoo"
+OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o
+OBJS += frontend/gp2x/in_gp2x.o frontend/warm/warm.o
+libpcsxcore/new_dynarec/pcsxmem.o: CFLAGS += -DCUSTOM_MEMMAPS
+USE_FRONTEND = 1
+endif
+ifeq "$(PLATFORM)" "maemo"
 OBJS += maemo/hildon.o maemo/main.o
 maemo/%.o: maemo/%.c
-maemo/%.o: CFLAGS += -Wall
-else
-OBJS += frontend/plugin_lib.o frontend/menu.o
-OBJS += frontend/linux/fbdev.o frontend/linux/in_evdev.o
-OBJS += frontend/linux/plat.o frontend/linux/oshide.o
-OBJS += frontend/common/fonts.o frontend/common/input.o frontend/common/readpng.o
-ifeq "$(ARCH)" "arm"
-OBJS += frontend/plat_omap.o
-OBJS += frontend/pandora.o
-else
-OBJS += frontend/plat_dummy.o
+OBJS += frontend/plugin_lib.o
 endif
-endif # !USE_GTK
-ifeq "$(ARCH)" "arm"
-OBJS += frontend/arm_utils.o
+ifeq "$(PLATFORM)" "libretro"
+OBJS += frontend/libretro.o
+endif
+ifeq "$(USE_FRONTEND)" "1"
+OBJS += frontend/menu.o frontend/linux/in_evdev.o
+OBJS += frontend/common/input.o
+OBJS += frontend/plugin_lib.o
+ifeq "$(HAVE_TSLIB)" "1"
+frontend/%.o: CFLAGS += -DHAVE_TSLIB
+OBJS += frontend/pl_gun_ts.o
+endif
+else
+CFLAGS += -DNO_FRONTEND
 endif
+
 ifdef X11
 frontend/%.o: CFLAGS += -DX11
 OBJS += frontend/xkb.o
@@ -114,8 +175,11 @@ endif
 ifdef PCNT
 CFLAGS += -DPCNT
 endif
-frontend/%.o: CFLAGS += -Wall -DIN_EVDEV
-frontend/menu.o: frontend/revision.h
+frontend/%.o: CFLAGS += -DIN_EVDEV
+frontend/menu.o frontend/main.o frontend/plat_sdl.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"/' > $@_
@@ -123,36 +187,85 @@ frontend/revision.h: FORCE
 	@rm $@_
 .PHONY: FORCE
 
+%.o: %.S
+	$(CC) $(CFLAGS) -c $^ -o $@
+
+target_: $(TARGET)
 
 $(TARGET): $(OBJS)
-	$(CC) -o $@ $^ $(LDFLAGS) -Wl,-Map=$@.map
+	$(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map
 
-PLUGINS = plugins/spunull/spunull.so plugins/gpu_unai/gpuPCSX4ALL.so \
-	plugins/gpu-gles/gpuGLES.so
+clean: $(PLAT_CLEAN) clean_plugins
+	$(RM) $(TARGET) $(OBJS) $(TARGET).map
+
+ifneq ($(PLUGINS),)
+plugins_: $(PLUGINS)
 
 $(PLUGINS):
 	make -C $(dir $@)
 
-clean:
-	$(RM) $(TARGET) $(OBJS) $(TARGET).map
-
 clean_plugins:
+	make -C plugins/gpulib/ clean
 	for dir in $(PLUGINS) ; do \
 		$(MAKE) -C $$(dirname $$dir) clean; done
+else
+plugins_:
+clean_plugins:
+endif
 
 # ----------- release -----------
 
-PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
-
 VER ?= $(shell git describe master)
 
+ifeq "$(PLATFORM)" "generic"
+OUT = pcsx_rearmed_$(VER)
+
+rel: pcsx $(PLUGINS) \
+		frontend/pandora/skin readme.txt COPYING
+	rm -rf $(OUT)
+	mkdir -p $(OUT)/plugins
+	mkdir -p $(OUT)/bios
+	cp -r $^ $(OUT)/
+	mv $(OUT)/*.so* $(OUT)/plugins/
+	zip -9 -r $(OUT).zip $(OUT)
+endif
+
+ifeq "$(PLATFORM)" "pandora"
+PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
+
 rel: pcsx $(PLUGINS) \
-		pandora/pcsx.sh pandora/pcsx.pxml.templ pandora/pcsx.png \
-		pandora/picorestore pandora/readme.txt pandora/skin COPYING
+		frontend/pandora/pcsx.sh frontend/pandora/pcsx.pxml.templ frontend/pandora/pcsx.png \
+		frontend/pandora/picorestore frontend/pandora/skin readme.txt COPYING
 	rm -rf out
 	mkdir -p out/plugins
 	cp -r $^ out/
 	sed -e 's/%PR%/$(VER)/g' out/pcsx.pxml.templ > out/pcsx.pxml
 	rm out/pcsx.pxml.templ
 	mv out/*.so out/plugins/
-	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i pandora/pcsx.png -c
+	$(PND_MAKE) -p pcsx_rearmed_$(VER).pnd -d out -x out/pcsx.pxml -i frontend/pandora/pcsx.png -c
+endif
+
+ifeq "$(PLATFORM)" "caanoo"
+PLAT_CLEAN = caanoo_clean
+
+caanoo_clean:
+	$(RM) frontend/320240/pollux_set
+
+rel: pcsx $(PLUGINS) \
+		frontend/320240/caanoo.gpe frontend/320240/pcsx26.png \
+		frontend/320240/pcsxb.png frontend/320240/skin \
+		frontend/warm/bin/warm_2.6.24.ko frontend/320240/pollux_set \
+		frontend/320240/pcsx_rearmed.ini frontend/320240/haptic_w.cfg \
+		frontend/320240/haptic_s.cfg \
+		readme.txt COPYING
+	rm -rf out
+	mkdir -p out/pcsx_rearmed/plugins
+	cp -r $^ out/pcsx_rearmed/
+	mv out/pcsx_rearmed/*.so out/pcsx_rearmed/plugins/
+	mv out/pcsx_rearmed/caanoo.gpe out/pcsx_rearmed/pcsx.gpe
+	mv out/pcsx_rearmed/pcsx_rearmed.ini out/
+	mkdir out/pcsx_rearmed/lib/
+	cp ./lib/libbz2.so.1 out/pcsx_rearmed/lib/
+	mkdir out/pcsx_rearmed/bios/
+	cd out && zip -9 -r ../pcsx_rearmed_$(VER)_caanoo.zip *
+endif