VS 2019 compatibility fixes (#52)

* Split out Options, simplify KeyBinds

* Split out everything

* More cleaning

* Move dynamic imports to init

* Fix const char errors

* Update all python scripts

* Remove extra file

Author: Matt-Hurd

PythonSDK.vcxproj

@@ -186,11 +186,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>PythonSDK</TargetName>
+    <TargetName>ddraw</TargetName>
     <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
     <IncludePath>$(PYTHONPATH)\include;$(IncludePath);$(VC_SourcePath)\src\include;</IncludePath>
     <LibraryPath>$(PYTHONPATH)\libs;$(LibraryPath)</LibraryPath>
-    <OutDir>C:\Program Files (x86)\Steam\steamapps\common\Borderlands 2\Binaries\Win32\Plugins\</OutDir>
+    <OutDir>C:\Program Files (x86)\Steam\steamapps\common\Borderlands 2\Binaries\Win32\</OutDir>
     <IntDir>build\$(Configuration)\</IntDir>
     <SourcePath>$(VC_SourcePath)\src;</SourcePath>
   </PropertyGroup>

src/CPythonInterface.cpp

@@ -35,7 +35,7 @@ bool VerifyPythonFunction(py::object funcHook, const char** expectedKeys) {
 	}
 	for (int x = 0; x < PyList_GET_SIZE(Keys) - 1; x++) {
 		PyObject *Key = PyList_GET_ITEM(Keys, x);
-		char *KeyString = PyUnicode_AsUTF8AndSize(Key, 0);
+		const char *KeyString = PyUnicode_AsUTF8AndSize(Key, 0);
 		if (strcmp(KeyString, expectedKeys[x]))
 		{
 			Logging::LogF("[Error] Got unexpected argument '%s'. Expected '%s'.\n", KeyString, expectedKeys[x]);

src/include/stdafx.h

@@ -320,7 +320,7 @@ namespace pybind11 {
 				if (!isinstance<sequence>(src))
 					return false;
 				PyObject *source = src.ptr();
-				char *tmp = PyUnicode_AsUTF8AndSize(source, nullptr);
+				const char *tmp = PyUnicode_AsUTF8AndSize(source, nullptr);
 				if (!tmp)
 					return false;
 				value = FString(tmp);
@@ -346,7 +346,7 @@ namespace pybind11 {
 				if (!isinstance<sequence>(src))
 					return false;
 				PyObject *source = src.ptr();
-				char *tmp = PyUnicode_AsUTF8AndSize(source, nullptr);
+				const char *tmp = PyUnicode_AsUTF8AndSize(source, nullptr);
 				if (!tmp)
 					return false;
 				value = UObject::FindClass(tmp, false);
@@ -369,7 +369,7 @@ namespace pybind11 {
 				if (!isinstance<sequence>(src))
 					return false;
 				PyObject *source = src.ptr();
-				char *tmp = PyUnicode_AsUTF8AndSize(source, nullptr);
+				const char *tmp = PyUnicode_AsUTF8AndSize(source, nullptr);
 				if (!tmp)
 					return false;
 				value = FName(tmp);