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
Merge pull request #295 from retro-wertz/dynarec_speedhacks
[pcsx_rearmed.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
74e1fc5
..
1f491f3
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-159,6
+159,7
@@
endif
OBJS += plugins/cdrcimg/cdrcimg.o
# libchdr
OBJS += plugins/cdrcimg/cdrcimg.o
# libchdr
+ifeq "$(HAVE_CHD)" "1"
CFLAGS += -Ideps/libchdr
OBJS += deps/crypto/md5.o
OBJS += deps/crypto/sha1.o
CFLAGS += -Ideps/libchdr
OBJS += deps/crypto/md5.o
OBJS += deps/crypto/sha1.o
@@
-209,8
+210,9
@@
else
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
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 += -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
+CFLAGS += -D
HAVE_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
LDFLAGS += -lm
+endif
# dfinput
OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
# dfinput
OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o