Merge branch 'master' of https://github.com/jacksondunstan/UnityNativeScripting

jacksondunstan · jacksondunstan · commit a954e941ae46 · 2021-02-21T17:17:47.000-08:00
diff --git a/README.md b/README.md
@@ -192,7 +192,7 @@ With C++, the workflow looks like this:
 2. Create a directory for build files. Anywhere is fine.
 3. Open a Command Prompt by clicking the Start button, typing "Command Prompt", then clicking the app
 4. Execute `cd /path/to/your/build/directory`
-5. Execute `cmake -G "Visual Studio VERSION YEAR Win64" -DEDITOR=TRUE /path/to/your/project/CppSource`. Replace `VERSION` and `YEAR` with the version of Visual Studio you want to use. To see the options, execute `cmake --help` and look at the list at the bottom. For example, use `"Visual Studio 15 2017 Win64"` for Visual Studio 2017. Any version, including Community, works just fine. Remove `-DEDITOR=TRUE` for standalone builds.
+5. Execute `cmake -G "Visual Studio VERSION YEAR Win64" -DEDITOR=TRUE /path/to/your/project/CppSource`. Replace `VERSION` and `YEAR` with the version of Visual Studio you want to use. To see the options, execute `cmake --help` and look at the list at the bottom. For example, use `"Visual Studio 15 2017 Win64"` for Visual Studio 2017. Any version, including Community, works just fine. Remove `-DEDITOR=TRUE` for standalone builds. If you are using Visual Studio 2019, execute `cmake -G "Visual Studio 16" -A "x64" -DEDITOR=TRUE /path/to/your/project/CppSource` instead.
 6. The project files are now generated in your build directory
 7. Open `NativeScript.sln` and click `Build > Build Solution`.
 
diff --git a/Unity/Assets/CppSource/CMakeLists.txt b/Unity/Assets/CppSource/CMakeLists.txt
@@ -79,5 +79,9 @@ if (IOS)
 	set_xcode_property(${PROJECT_NAME} ENABLE_BITCODE "NO")
 endif()
 
+if(WIN32 AND MINGW)
+	set_property(TARGET ${PROJECT_NAME} PROPERTY PREFIX "")
+endif()
+
 # Enable C++11
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
diff --git a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs
