Merge pull request #200 from libretro/master

[libretro] sync with libretro repository (fixed CHD support on Android & added Travis-CI build script)

.travis.yml

@@ -0,0 +1,36 @@
+language: generic
+os: linux
+dist: trusty
+sudo: required
+addons:
+  apt:
+    packages:
+      - g++-7
+    sources:
+      - ubuntu-toolchain-r-test
+env:
+  global:
+    - CORE=genesis_plus_gx
+    - COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7
+  matrix:
+    - PLATFORM=3ds
+    - PLATFORM=linux_x64
+    - PLATFORM=ngc
+    - PLATFORM=wii
+    - PLATFORM=wiiu
+before_script:
+  - pwd
+  - mkdir -p ~/bin
+  - ln -s /usr/bin/gcc-7 ~/bin/gcc
+  - ln -s /usr/bin/g++-7 ~/bin/g++
+  - ln -s /usr/bin/cpp-7 ~/bin/cpp
+  - export PATH=~/bin:$PATH
+  - ls -l ~/bin
+  - echo $PATH
+  - g++-7 --version
+  - g++ --version
+script:
+  - cd ~/
+  - git clone --depth=50 https://github.com/libretro/libretro-super
+  - cd libretro-super/travis
+  - ./build.sh

libretro/jni/Android.mk

@@ -8,6 +8,7 @@ ifneq ($(GIT_VERSION)," unknown")
 endif
 
 WANT_CRC32 := 1
+HAVE_CHD := 1
 
 CORE_DIR := ../..
 
@@ -28,8 +29,12 @@ LOCAL_SRC_FILES := $(SOURCES_C)
 LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \
 			$(CORE_DIR)/libretro/libretro-common/include \
 			$(LOCAL_PATH)/$(TREMOR_SRC_DIR) \
-			$(LOCAL_PATH)/$(LIBRETRO_DIR)
+			$(LOCAL_PATH)/$(LIBRETRO_DIR) \
+			$(CHDLIBDIR)/src \
+			$(CHDLIBDIR)/deps/libFLAC/include \
+			$(CHDLIBDIR)/deps/lzma \
+			$(CHDLIBDIR)/deps/zlib
 
-LOCAL_CFLAGS += -ffast-math -O2 -funroll-loops -DINLINE="static inline" -DUSE_LIBTREMOR -DUSE_16BPP_RENDERING -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DALIGN_LONG -DALIGN_WORD -DM68K_OVERCLOCK_SHIFT=20 -DZ80_OVERCLOCK_SHIFT=20
+LOCAL_CFLAGS += -ffast-math -O2 -funroll-loops -DINLINE="static inline" -DUSE_LIBTREMOR -DUSE_16BPP_RENDERING -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DALIGN_LONG -DALIGN_WORD -DM68K_OVERCLOCK_SHIFT=20 -DZ80_OVERCLOCK_SHIFT=20 -DUSE_LIBCHDR -DPACKAGE_VERSION=\"1.3.2\" -DFLAC_API_EXPORTS -DFLAC__HAS_OGG=0 -DHAVE_LROUND -DHAVE_STDINT_H -D_7ZIP_ST -DHAVE_SYS_PARAM_H
 
 include $(BUILD_SHARED_LIBRARY)