notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try again
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
779f67a
..
ee3a44f
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,7
+12,9
@@
else
CFLAGS += -O2 -DNDEBUG
endif
endif
CFLAGS += -O2 -DNDEBUG
endif
endif
-CFLAGS += -DHAVE_MMAP=$(if $(NO_MMAP),0,1)
+CFLAGS += -DP_HAVE_MMAP=$(if $(NO_MMAP),0,1) \
+ -DP_HAVE_PTHREAD=$(if $(NO_PTHREAD),0,1) \
+ -DP_HAVE_POSIX_MEMALIGN=$(if $(NO_POSIX_MEMALIGN),0,1)
CXXFLAGS += $(CFLAGS)
#DRC_DBG = 1
#PCNT = 1
CXXFLAGS += $(CFLAGS)
#DRC_DBG = 1
#PCNT = 1
@@
-92,12
+94,13
@@
ifeq "$(DYNAREC)" "lightrec"
CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \
-DLIGHTREC -DLIGHTREC_STATIC
LIGHTREC_CUSTOM_MAP ?= 0
CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \
-DLIGHTREC -DLIGHTREC_STATIC
LIGHTREC_CUSTOM_MAP ?= 0
+LIGHTREC_CUSTOM_MAP_OBJ ?= libpcsxcore/lightrec/mem.o
LIGHTREC_THREADED_COMPILER ?= 0
CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP) \
-DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER)
ifeq ($(LIGHTREC_CUSTOM_MAP),1)
LDLIBS += -lrt
LIGHTREC_THREADED_COMPILER ?= 0
CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP) \
-DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER)
ifeq ($(LIGHTREC_CUSTOM_MAP),1)
LDLIBS += -lrt
-OBJS +=
libpcsxcore/lightrec/mem.o
+OBJS +=
$(LIGHTREC_CUSTOM_MAP_OBJ)
endif
ifeq ($(LIGHTREC_THREADED_COMPILER),1)
OBJS += deps/lightrec/recompiler.o \
endif
ifeq ($(LIGHTREC_THREADED_COMPILER),1)
OBJS += deps/lightrec/recompiler.o \
@@
-121,6
+124,7
@@
OBJS += deps/lightning/lib/jit_disasm.o \
deps/lightrec/memmanager.o \
deps/lightrec/optimizer.o \
deps/lightrec/regcache.o
deps/lightrec/memmanager.o \
deps/lightrec/optimizer.o \
deps/lightrec/regcache.o
+deps/lightning/%.o: CFLAGS += -DHAVE_MMAP=P_HAVE_MMAP
libpcsxcore/lightrec/mem.o: CFLAGS += -D_GNU_SOURCE
ifeq ($(MMAP_WIN32),1)
CFLAGS += -Iinclude/mman -I deps/mman
libpcsxcore/lightrec/mem.o: CFLAGS += -D_GNU_SOURCE
ifeq ($(MMAP_WIN32),1)
CFLAGS += -Iinclude/mman -I deps/mman
@@
-323,7
+327,7
@@
ifeq "$(PLATFORM)" "libretro"
ifeq "$(USE_LIBRETRO_VFS)" "1"
OBJS += deps/libretro-common/compat/compat_posix_string.o
OBJS += deps/libretro-common/compat/fopen_utf8.o
ifeq "$(USE_LIBRETRO_VFS)" "1"
OBJS += deps/libretro-common/compat/compat_posix_string.o
OBJS += deps/libretro-common/compat/fopen_utf8.o
-OBJS += deps/libretro-common/
encodings
/compat_strl.o
+OBJS += deps/libretro-common/
compat
/compat_strl.o
OBJS += deps/libretro-common/encodings/encoding_utf.o
OBJS += deps/libretro-common/file/file_path.o
OBJS += deps/libretro-common/streams/file_stream.o
OBJS += deps/libretro-common/encodings/encoding_utf.o
OBJS += deps/libretro-common/file/file_path.o
OBJS += deps/libretro-common/streams/file_stream.o