FIX: added correct python dll for windows 64bit

uic-evl · Apr 22, 2016 · f5af617 · f5af617
1 parent 236ccfb
commit f5af617
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/external/libs64/python27.dll b/external/libs64/python27.dll
diff --git a/include/version.h b/include/version.h
@@ -2,7 +2,7 @@
 #define __OMEGA_VERSION_
 
 #define OMEGA_VERSION_MAJOR 13
-#define OMEGA_VERSION_MINOR 0
+#define OMEGA_VERSION_MINOR 1
 #define OMEGA_VERSION_REVISION 0
 
 #define _VSTH(v) #v

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -34,8 +34,13 @@ if(OMEGA_ENABLE_PYTHON)
 		set(PYTHON_LIBRARIES ${CMAKE_SOURCE_DIR}/modules/python/libs/python27.lib)
 		include_directories(${PYTHON_INCLUDE_DIRS})
 		# copy the python dll to the output folders
-		configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} COPYONLY)
-		configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} COPYONLY)
+        if(OMEGA_ARCH_32)
+            configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} COPYONLY)
+            configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} COPYONLY)
+        else()
+            configure_file(${CMAKE_SOURCE_DIR}/external/libs64/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} COPYONLY)
+            configure_file(${CMAKE_SOURCE_DIR}/external/libs64/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} COPYONLY)
+        endif()
     else()
 		find_package(PythonLibs 2.7)
 		if(PYTHONLIBS_FOUND)