Fixed issue #114

Author: Ayuto

addons/source-python/Python3/plat-win/msvcp100.dll

@@ -185,11 +185,7 @@ bool CSourcePython::Load( CreateInterfaceFn interfaceFactory, CreateInterfaceFn
 	// Load windows dependencies.
 	// ------------------------------------------------------------------
 #if defined(_WIN32)
-	if( SPLoadLibrary(engine, MSVCRT_LIB) == NULL ) {
-		return false;
-	}
-
-	if( SPLoadLibrary(engine, MSVCP_LIB) == NULL ) {
+	if( SPLoadLibrary(engine, VCRUNTIME_LIB) == NULL ) {
 		return false;
 	}
 #endif

addons/source-python/Python3/plat-win/msvcr100.dll

@@ -35,32 +35,23 @@
 //---------------------------------------------------------------------------------
 // Definitions
 //---------------------------------------------------------------------------------
-#define PYLIB_NAME_WIN32_RELEASE	"Python3/plat-win/python35.dll"
-#define PYLIB_NAME_WIN32_DEBUG		"Python3/plat-win/python35_d.dll"
-#define PYLIB_NAME_LINUX_RELEASE	"Python3/plat-linux/libpython3.5m.so.1.0"
-#define PYLIB_NAME_LINUX_DEBUG		"Python3/plat-linux/libpython3.5dm.so.1.0"
+#define PYLIB_NAME_WIN32	"Python3/plat-win/python35.dll"
+#define PYLIB_NAME_LINUX	"Python3/plat-linux/libpython3.5m.so.1.0"
 
-#define CORE_NAME_WIN32				"bin/core.dll"
-#define CORE_NAME_LINUX				"bin/core.so"
+#define CORE_NAME_WIN32		"bin/core.dll"
+#define CORE_NAME_LINUX		"bin/core.so"
 
 #if defined(_WIN32)
 #	define CORE_NAME  CORE_NAME_WIN32
 #else
 #	define CORE_NAME  CORE_NAME_LINUX
 #endif
 
-#if defined(_WIN32) && defined(DEBUG)
-#	define PYLIB_NAME PYLIB_NAME_WIN32_DEBUG
-#	define MSVCRT_LIB "Python3/plat-win/msvcr100d.dll"
-#	define MSVCP_LIB  "Python3/plat-win/msvcp100d.dll"
-#elif defined(_WIN32) && !defined(DEBUG)
-#	define PYLIB_NAME PYLIB_NAME_WIN32_RELEASE
-#	define MSVCRT_LIB "Python3/plat-win/msvcr100.dll"
-#	define MSVCP_LIB  "Python3/plat-win/msvcp100.dll"
-#elif defined(LINUX) && defined(DEBUG)
-#	define PYLIB_NAME PYLIB_NAME_LINUX_DEBUG
-#elif defined(LINUX) && !defined(DEBUG)
-#	define PYLIB_NAME PYLIB_NAME_LINUX_RELEASE
+#if defined(_WIN32)
+#	define PYLIB_NAME PYLIB_NAME_WIN32
+#	define VCRUNTIME_LIB "Python3/plat-win/vcruntime140.dll"
+#elif defined(LINUX)
+#	define PYLIB_NAME PYLIB_NAME_LINUX
 #endif
 
 #define MAX_PATH_LENGTH 1024