From 3d2b11d1d07ec29f97c2c1b5c1ad662dd05ed575 Mon Sep 17 00:00:00 2001 From: Nadav Bhonker Date: Wed, 22 Mar 2017 15:39:13 +0200 Subject: [PATCH] update CMakeLists to match new Genesis makefile scheme --- CMakeLists.txt | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ae84e7..fa4e319 100644 --- 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,9 +125,9 @@ 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}" ) @@ -135,9 +135,9 @@ 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 index 5541882..6f791c4 100644 --- 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',