Merge pull request #5624 from JonBooth78/master

Build directly from the CMake configurations on windows with Visual Studio 2019

.gitignore

@@ -71,6 +71,7 @@ pioneer-*.tar.*
 *.opensdf
 *.o
 *.a
+*.manifest
 /*.exe
 /*.dll
 /*.pdb

CMakePresets.json

@@ -0,0 +1,54 @@
+{
+  "version": 2,
+  "configurePresets": [
+    {
+        "name": "x64-Debug",
+        "displayName": "Windows x64 Debug",
+        "description": "Target Windows with the Visual Studio development environment.",
+        "generator": "Ninja",
+        "binaryDir": "${sourceDir}/out/build/${presetName}",
+        "architecture": {
+            "value": "x64",
+            "strategy": "external"
+        },
+        "cacheVariables": {
+            "CMAKE_BUILD_TYPE": "Debug",
+            "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
+        },
+        "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } }
+    },
+    {
+        "name": "x64-Release",
+        "displayName": "Windows x64 Release",
+        "description": "Target Windows with the Visual Studio development environment.",
+        "generator": "Ninja",
+        "binaryDir": "${sourceDir}/out/build/${presetName}",
+        "architecture": {
+            "value": "x64",
+            "strategy": "external"
+        },
+        "cacheVariables": {
+            "CMAKE_BUILD_TYPE": "Release",
+            "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
+        },
+        "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } }
+    },
+    {
+        "name": "x64-Profiling",
+        "displayName": "Windows x64 Profiling",
+        "description": "Target Windows with the Visual Studio development environment.",
+        "generator": "Ninja",
+        "binaryDir": "${sourceDir}/out/build/${presetName}",
+        "architecture": {
+            "value": "x64",
+            "strategy": "external"
+        },
+        "cacheVariables": {
+            "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+            "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
+            "PROFILER_ENABLED": "1"
+        },
+        "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } }
+    }
+  ]
+}

COMPILING.txt

@@ -81,7 +81,8 @@ questions are welcome anytime.
    in a directory side by side. Don't rename pioneer-thirdparty because the
    relative path to it is included in the project files.
 
-2. Open the pioneer solution from /win32/vc2019/pioneer.sln.
+2. Open the pioneer folder which should open as a CMake project
+   see https://learn.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-160
 
 3. Build and run the project or solution. Note: the default is to build debug
    version, which is what you want if developing, but release gives an executable

msvc-defaults.cmake

@@ -14,7 +14,7 @@ set(SDL2_IMAGE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/incl
 set(SDL2_IMAGE_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/${MSVC_ARCH}/vs2019/SDL2_image.lib)
 
 set(ASSIMP_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include)
-set(ASSIMP_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/${MSVC_ARCH}/vs2019/assimp-vc142-mt.lib)
+set(ASSIMP_LIBRARIES optimized ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/${MSVC_ARCH}/vs2019/assimp-vc142-mt.lib debug ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/${MSVC_ARCH}/vs2019/assimp-vc142-mtd.lib)
 
 set(VORBISFILE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/include)
 set(VORBISFILE_LIBRARIES ${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/${MSVC_ARCH}/vs2019/ogg.lib;${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/${MSVC_ARCH}/vs2019/vorbis.lib;${CMAKE_SOURCE_DIR}/../pioneer-thirdparty/win32/lib/${MSVC_ARCH}/vs2019/vorbisfile.lib)