another setup.py fix

nadavbh12 · Feb 14, 2017 · e06e57f · e06e57f
1 parent d52569f
commit e06e57f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,7 +45,6 @@ if(USE_SDL)
   endif()
 endif()
 
-
 set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 set(SNES9X_DIR ${CMAKE_CURRENT_SOURCE_DIR}/snes9x2010)
 set(STELLA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stella-libretro)
@@ -219,7 +218,7 @@ if(UNIT_TESTING)
 #    )
 
 #  endif()
-  	add_definitions(-D__UNIT_TESTING)
+    add_definitions(-D__UNIT_TESTING)
     add_subdirectory(googletest)
     enable_testing()
     include_directories(${GTEST_INCLUDE_DIRS} ${PYTHON_RLE_DIR})

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
 recursive-include src *
 recursive-include rle_python_interface *
+recursive-include rle_python_interface *.so
 include CMakeLists.txt
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def run_cmake():
     cores_to_use = max(1, multiprocessing.cpu_count() - 1)
 
     try:
-        ds.spawn(['cmake', '../'] + cmake_args.split())
+        ds.spawn(['cmake', '..'] + cmake_args.split())
         ds.spawn(['make', '-j', str(cores_to_use)])
     except ds.DistutilsExecError:
         print "Error while running cmake"
@@ -39,6 +39,8 @@ def run(self):
         cwd = os.getcwd()
         run_cmake()
         os.chdir(cwd)
+        ds.spawn(['./copy_cores.sh'])
+        _build.build.run(self)
 
 setup(name = 'rle_python_interface',
       version='1.0.5',