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
Move input type selection to RETRO_ENVIRONMENT_SET_CONTROLLER_INFO
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
f633665
..
d751fb1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,7
+6,7
@@
CFLAGS += -Wall -Iinclude -ffast-math
ifeq ($(DEBUG), 1)
CFLAGS += -O0 -ggdb
else
ifeq ($(DEBUG), 1)
CFLAGS += -O0 -ggdb
else
-ifeq ($(platform),
vita
)
+ifeq ($(platform),
$(filter $(platform), vita ctr)
)
CFLAGS += -O3 -DNDEBUG
else
CFLAGS += -O2 -DNDEBUG
CFLAGS += -O3 -DNDEBUG
else
CFLAGS += -O2 -DNDEBUG
@@
-97,7
+97,8
@@
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/lightrec/recompiler.o
+ deps/lightrec/recompiler.o \
+ deps/lightrec/reaper.o
ifeq ($(MMAP_WIN32),1)
CFLAGS += -Ideps/mman
OBJS += deps/mman/mman.o
ifeq ($(MMAP_WIN32),1)
CFLAGS += -Ideps/mman
OBJS += deps/mman/mman.o
@@
-192,6
+193,10
@@
endif
plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3
CC_LINK = $(CXX)
endif
plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3
CC_LINK = $(CXX)
endif
+ifeq "$(THREAD_RENDERING)" "1"
+CFLAGS += -DTHREAD_RENDERING
+OBJS += plugins/gpulib/gpulib_thread_if.o
+endif
# cdrcimg
OBJS += plugins/cdrcimg/cdrcimg.o
# cdrcimg
OBJS += plugins/cdrcimg/cdrcimg.o
@@
-253,7
+258,9
@@
LDFLAGS += -lm
endif
# dfinput
endif
# dfinput
+ifneq "$(PLATFORM)" "libretro"
OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
+endif
# frontend/gui
OBJS += frontend/cspace.o
# frontend/gui
OBJS += frontend/cspace.o