Commit f4a2cb6
committed
Fixed issue Source-Python-Dev-Team#114
1 parent 79593cb commit f4a2cb6
5 files changed
Lines changed: 10 additions & 23 deletions
File tree
- addons/source-python/Python3/plat-win
- src/loader
Binary file not shown.
Binary file not shown.
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -185,11 +185,7 @@ bool CSourcePython::Load( CreateInterfaceFn interfaceFactory, CreateInterfaceFn | |||
| 185 | 185 | // Load windows dependencies. | |
| 186 | 186 | // ------------------------------------------------------------------ | |
| 187 | 187 | #if defined(_WIN32) | |
| 188 | - if( SPLoadLibrary(engine, MSVCRT_LIB) == NULL ) { | ||
| 189 | - return false; | ||
| 190 | - } | ||
| 191 | - | ||
| 192 | - if( SPLoadLibrary(engine, MSVCP_LIB) == NULL ) { | ||
| 188 | + if( SPLoadLibrary(engine, VCRUNTIME_LIB) == NULL ) { | ||
| 193 | 189 | return false; | |
| 194 | 190 | } | |
| 195 | 191 | #endif | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -35,32 +35,23 @@ | |||
| 35 | 35 | //--------------------------------------------------------------------------------- | |
| 36 | 36 | // Definitions | |
| 37 | 37 | //--------------------------------------------------------------------------------- | |
| 38 | - #define PYLIB_NAME_WIN32_RELEASE "Python3/plat-win/python35.dll" | ||
| 39 | - #define PYLIB_NAME_WIN32_DEBUG "Python3/plat-win/python35_d.dll" | ||
| 40 | - #define PYLIB_NAME_LINUX_RELEASE "Python3/plat-linux/libpython3.5m.so.1.0" | ||
| 41 | - #define PYLIB_NAME_LINUX_DEBUG "Python3/plat-linux/libpython3.5dm.so.1.0" | ||
| 38 | + #define PYLIB_NAME_WIN32 "Python3/plat-win/python35.dll" | ||
| 39 | + #define PYLIB_NAME_LINUX "Python3/plat-linux/libpython3.5m.so.1.0" | ||
| 42 | 40 | ||
| 43 | - #define CORE_NAME_WIN32 "bin/core.dll" | ||
| 44 | - #define CORE_NAME_LINUX "bin/core.so" | ||
| 41 | + #define CORE_NAME_WIN32 "bin/core.dll" | ||
| 42 | + #define CORE_NAME_LINUX "bin/core.so" | ||
| 45 | 43 | ||
| 46 | 44 | #if defined(_WIN32) | |
| 47 | 45 | # define CORE_NAME CORE_NAME_WIN32 | |
| 48 | 46 | #else | |
| 49 | 47 | # define CORE_NAME CORE_NAME_LINUX | |
| 50 | 48 | #endif | |
| 51 | 49 | ||
| 52 | - #if defined(_WIN32) && defined(DEBUG) | ||
| 53 | - # define PYLIB_NAME PYLIB_NAME_WIN32_DEBUG | ||
| 54 | - # define MSVCRT_LIB "Python3/plat-win/msvcr100d.dll" | ||
| 55 | - # define MSVCP_LIB "Python3/plat-win/msvcp100d.dll" | ||
| 56 | - #elif defined(_WIN32) && !defined(DEBUG) | ||
| 57 | - # define PYLIB_NAME PYLIB_NAME_WIN32_RELEASE | ||
| 58 | - # define MSVCRT_LIB "Python3/plat-win/msvcr100.dll" | ||
| 59 | - # define MSVCP_LIB "Python3/plat-win/msvcp100.dll" | ||
| 60 | - #elif defined(LINUX) && defined(DEBUG) | ||
| 61 | - # define PYLIB_NAME PYLIB_NAME_LINUX_DEBUG | ||
| 62 | - #elif defined(LINUX) && !defined(DEBUG) | ||
| 63 | - # define PYLIB_NAME PYLIB_NAME_LINUX_RELEASE | ||
| 50 | + #if defined(_WIN32) | ||
| 51 | + # define PYLIB_NAME PYLIB_NAME_WIN32 | ||
| 52 | + # define VCRUNTIME_LIB "Python3/plat-win/vcruntime140.dll" | ||
| 53 | + #elif defined(LINUX) | ||
| 54 | + # define PYLIB_NAME PYLIB_NAME_LINUX | ||
| 64 | 55 | #endif | |
| 65 | 56 | ||
| 66 | 57 | #define MAX_PATH_LENGTH 1024 | |
0 commit comments