Skip to content

Commit f5af617

Browse files
committed
FIX: added correct python dll for windows 64bit
1 parent 236ccfb commit f5af617

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

external/libs64/python27.dll

3.24 MB
Binary file not shown.

include/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define __OMEGA_VERSION_
33

44
#define OMEGA_VERSION_MAJOR 13
5-
#define OMEGA_VERSION_MINOR 0
5+
#define OMEGA_VERSION_MINOR 1
66
#define OMEGA_VERSION_REVISION 0
77

88
#define _VSTH(v) #v

src/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,13 @@ if(OMEGA_ENABLE_PYTHON)
3434
set(PYTHON_LIBRARIES ${CMAKE_SOURCE_DIR}/modules/python/libs/python27.lib)
3535
include_directories(${PYTHON_INCLUDE_DIRS})
3636
# copy the python dll to the output folders
37-
configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} COPYONLY)
38-
configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} COPYONLY)
37+
if(OMEGA_ARCH_32)
38+
configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} COPYONLY)
39+
configure_file(${CMAKE_SOURCE_DIR}/external/libs32/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} COPYONLY)
40+
else()
41+
configure_file(${CMAKE_SOURCE_DIR}/external/libs64/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} COPYONLY)
42+
configure_file(${CMAKE_SOURCE_DIR}/external/libs64/python27.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} COPYONLY)
43+
endif()
3944
else()
4045
find_package(PythonLibs 2.7)
4146
if(PYTHONLIBS_FOUND)

0 commit comments

Comments
 (0)