diff options
author | hizzlekizzle | 2019-05-19 07:48:22 -0500 |
---|---|---|
committer | GitHub | 2019-05-19 07:48:22 -0500 |
commit | 36e1dd7c54e92db6076ba2e249a3b2bee9f5f7c4 (patch) | |
tree | 16c59b90e8f85f0d9e58dfe319e86e2b59b6ed57 /Makefile | |
parent | 4b7520c6f2095bbda2fcfd2eb530932ab7b30694 (diff) | |
parent | b0ec2e6d0719603212373bcdaaedd5b7b5e43121 (diff) | |
download | pcsx_rearmed-36e1dd7c54e92db6076ba2e249a3b2bee9f5f7c4.tar.gz pcsx_rearmed-36e1dd7c54e92db6076ba2e249a3b2bee9f5f7c4.tar.bz2 pcsx_rearmed-36e1dd7c54e92db6076ba2e249a3b2bee9f5f7c4.zip |
Merge pull request #290 from retro-wertz/chd
Allow building without CHD, disable CHD for 3DS
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -159,6 +159,7 @@ endif OBJS += plugins/cdrcimg/cdrcimg.o # libchdr +ifeq "$(HAVE_CHD)" "1" CFLAGS += -Ideps/libchdr OBJS += deps/crypto/md5.o OBJS += deps/crypto/sha1.o @@ -208,8 +209,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 -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 += -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 |