update CMakeLists to match new Genesis makefile scheme

nadavbh12 · Mar 22, 2017 · 3d2b11d · 3d2b11d
1 parent 546b8e7
commit 3d2b11d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -115,7 +115,7 @@ ExternalProject_add(snes9x2010_libretro
 			GIT_REPOSITORY https://github.com/libretro/snes9x2010.git
 			UPDATE_COMMAND ""
 			SOURCE_DIR ${SNES9X_DIR}
-			BINARY_DIR ${SNES9X_DIR}
+			BUILD_IN_SOURCE 1
 			CONFIGURE_COMMAND ""
 			BUILD_COMMAND ${MAKE}
 			INSTALL_DIR ${LIBDIR}
@@ -125,19 +125,19 @@ ExternalProject_add(stella_libretro
 			GIT_REPOSITORY https://github.com/libretro/stella-libretro.git
 			UPDATE_COMMAND ""
 			SOURCE_DIR ${STELLA_DIR}
-			BINARY_DIR ${STELLA_DIR}
 			CONFIGURE_COMMAND ""
 			BUILD_COMMAND ${MAKE}
+			BUILD_IN_SOURCE 1
 			INSTALL_DIR ${LIBDIR}
 			INSTALL_COMMAND "${STELLA_INSTALL_COMMAND}"
 		   )
 ExternalProject_add(genesis_plus_gx_libretro
 			GIT_REPOSITORY https://github.com/libretro/Genesis-Plus-GX
 			UPDATE_COMMAND ""
 			SOURCE_DIR ${GENESIS_PLUS_GX_DIR}
-			BINARY_DIR ${GENESIS_PLUS_GX_DIR}
+			BUILD_IN_SOURCE 1
 			CONFIGURE_COMMAND ""
-			BUILD_COMMAND ${MAKE}
+			BUILD_COMMAND make -f Makefile.libretro
 			INSTALL_DIR ${LIBDIR}
 			INSTALL_COMMAND "${GENESIS_INSTALL_COMMAND}"
 		   )

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@ def run(self):
         ds.spawn(['./copy_cores.sh'])
         _build.build.run(self)
 
-version = '1.1.4'
+version = '1.1.5'
 setup(name = 'rle_python_interface',
       version=version,
       description = 'Retro Learning Environment Python Interface based on Ben Goodrich\'s work',