This commit is contained in:
twinaphex 2017-09-21 19:37:05 +02:00
parent 1e30f02ecc
commit 939b3b8772
2 changed files with 10 additions and 5 deletions

View File

@ -1148,11 +1148,11 @@ DEPENDENCIES
#endif
#ifdef HAVE_CHD
#include "../deps/libchdr/bitstream.c"
#include "../deps/libchdr/cdrom.c"
#include "../deps/libchdr/chd.c"
#include "../deps/libchdr/flac.c"
#include "../deps/libchdr/huffman.c"
#include "../libretro-common/formats/libchdr/bitstream.c"
#include "../libretro-common/formats/libchdr/cdrom.c"
#include "../libretro-common/formats/libchdr/chd.c"
#include "../libretro-common/formats/libchdr/flac.c"
#include "../libretro-common/formats/libchdr/huffman.c"
#include "../libretro-common/streams/chd_stream.c"
#endif

View File

@ -78,6 +78,7 @@ DEFINES += -DHAVE_7ZIP
DEFINES += -DHAVE_CHEEVOS
DEFINES += -DHAVE_SL
#DEFINES += -DHAVE_TINYALSA
DEFINES += -DFLAC_PACKAGE_VERSION="\"retroarch\"" -DHAVE_LROUND -DFLAC__HAS_OGG=0
LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES)
LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder $(DEFINES)
@ -90,6 +91,10 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ \
$(LOCAL_PATH)/$(RARCH_DIR)/deps
LOCAL_CFLAGS += -I$(LOCAL_PATH)/$(DEPS_DIR)/7zip/
LOCAL_CXXFLAGS += -I$(LOCAL_PATH)/$(DEPS_DIR)/7zip/
LOCAL_CFLAGS += -I$(LOCAL_PATH)/$(DEPS_DIR)/libFLAC/include
LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(DEPS_DIR)/libFLAC/include
ifeq ($(HAVE_VULKAN),1)