X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=a2785194d3318b2e9f25b59c66bba320cc08d1e4;hb=8ec1e4de88798ca548481773e49bb01a4de03139;hp=627ccf4f0608bbfa21b6acffdd2109e4306f01de;hpb=9b400da1a7d44efda870462121b3e36ab42e134b;p=pcsx_rearmed.git

diff --git a/Makefile b/Makefile
index 627ccf4f..a2785194 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,14 @@
 TARGET ?= pcsx
 CFLAGS += -Wall -Iinclude -ffast-math
 ifeq ($(DEBUG), 1)
-CFLAGS += -O0 -ggdb -DOPENGL_DEBUG
+CFLAGS += -O0 -ggdb
+else
+ifeq ($(platform), vita)
+CFLAGS += -O3 -DNDEBUG
 else
 CFLAGS += -O2 -DNDEBUG
 endif
+endif
 CXXFLAGS += $(CFLAGS)
 #DRC_DBG = 1
 #PCNT = 1
@@ -48,6 +52,23 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore
 	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 ($(WANT_ZLIB),1)
+CFLAGS += -Ideps/zlib
+OBJS += deps/zlib/adler32.o \
+        deps/zlib/compress.o \
+        deps/zlib/crc32.o \
+        deps/zlib/deflate.o \
+        deps/zlib/gzclose.o \
+        deps/zlib/gzlib.o \
+        deps/zlib/gzread.o \
+        deps/zlib/gzwrite.o \
+        deps/zlib/inffast.o \
+        deps/zlib/inflate.o \
+        deps/zlib/inftrees.o \
+        deps/zlib/trees.o \
+        deps/zlib/uncompr.o \
+        deps/zlib/zutil.o
+endif
 ifeq "$(ARCH)" "arm"
 OBJS += libpcsxcore/gte_arm.o
 endif
@@ -58,22 +79,23 @@ 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
+OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/arm/linkage_arm.o
+OBJS += libpcsxcore/new_dynarec/backends/psx/pcsxmem.o
 else
-libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -DDRC_DISABLE
+libpcsxcore/new_dynarec/backends/psx/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 \
-	libpcsxcore/new_dynarec/pcsxmem_inline.c
-libpcsxcore/new_dynarec/new_dynarec.o: CFLAGS += -Wno-all -Wno-pointer-sign
+OBJS += libpcsxcore/new_dynarec/backends/psx/emu_if.o
+libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/arm/assem_arm.c \
+	libpcsxcore/new_dynarec/backends/psx/pcsxmem_inline.c
 ifdef DRC_DBG
-libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
+libpcsxcore/new_dynarec/backends/psx/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
+libpcsxcore/new_dynarec/backends/psx/%.o: CFLAGS += -DBASE_ADDR_FIXED=1
+libpcsxcore/new_dynarec/arm/%.o: CFLAGS += -DBASE_ADDR_FIXED=1
 endif
 
 # spu
@@ -136,6 +158,62 @@ endif
 # cdrcimg
 OBJS += plugins/cdrcimg/cdrcimg.o
 
+# libchdr
+ifeq "$(HAVE_CHD)" "1"
+CFLAGS += -Ideps/libchdr
+OBJS += deps/crypto/md5.o
+OBJS += deps/crypto/sha1.o
+OBJS += deps/flac-1.3.2/src/libFLAC/bitmath.o
+OBJS += deps/flac-1.3.2/src/libFLAC/bitreader.o
+OBJS += deps/flac-1.3.2/src/libFLAC/cpu.o
+OBJS += deps/flac-1.3.2/src/libFLAC/crc.o
+OBJS += deps/flac-1.3.2/src/libFLAC/fixed.o
+OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o
+OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o
+OBJS += deps/flac-1.3.2/src/libFLAC/float.o
+OBJS += deps/flac-1.3.2/src/libFLAC/format.o
+OBJS += deps/flac-1.3.2/src/libFLAC/lpc.o
+OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o
+OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o
+OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o
+OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o
+OBJS += deps/flac-1.3.2/src/libFLAC/md5.o
+OBJS += deps/flac-1.3.2/src/libFLAC/memory.o
+OBJS += deps/flac-1.3.2/src/libFLAC/metadata_iterators.o
+OBJS += deps/flac-1.3.2/src/libFLAC/metadata_object.o
+OBJS += deps/flac-1.3.2/src/libFLAC/stream_decoder.o
+OBJS += deps/flac-1.3.2/src/libFLAC/window.o
+OBJS += deps/lzma-16.04/C/Alloc.o
+OBJS += deps/lzma-16.04/C/Bra86.o
+OBJS += deps/lzma-16.04/C/Bra.o
+OBJS += deps/lzma-16.04/C/BraIA64.o
+OBJS += deps/lzma-16.04/C/CpuArch.o
+OBJS += deps/lzma-16.04/C/Delta.o
+OBJS += deps/lzma-16.04/C/LzFind.o
+OBJS += deps/lzma-16.04/C/Lzma86Dec.o
+OBJS += deps/lzma-16.04/C/Lzma86Enc.o
+OBJS += deps/lzma-16.04/C/LzmaDec.o
+OBJS += deps/lzma-16.04/C/LzmaEnc.o
+OBJS += deps/lzma-16.04/C/LzmaLib.o
+OBJS += deps/lzma-16.04/C/Sort.o
+OBJS += deps/libchdr/bitstream.o
+OBJS += deps/libchdr/cdrom.o
+OBJS += deps/libchdr/chd.o
+OBJS += deps/libchdr/flac.o
+OBJS += deps/libchdr/huffman.o
+
+ifneq (,$(findstring win,$(platform)))
+  CFLAGS += -DHAVE_FSEEKO
+  OBJS += deps/flac-1.3.2/src/libFLAC/windows_unicode_filenames.o
+else
+  CFLAGS += -DHAVE_SYS_PARAM_H
+endif
+
+CFLAGS += -Ideps/crypto -Ideps/flac-1.3.2/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/lzma-16.04/C
+CFLAGS += -DHAVE_CHD -D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST
+LDFLAGS += -lm
+endif
+
 # dfinput
 OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
 
@@ -253,7 +331,8 @@ frontend/revision.h: FORCE
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 target_: $(TARGET)