diff --git a/GlitchyEngineHelper/BeefProj.toml b/GlitchyEngineHelper/BeefProj.toml index 1f97ac5..8933dc5 100644 --- a/GlitchyEngineHelper/BeefProj.toml +++ b/GlitchyEngineHelper/BeefProj.toml @@ -10,4 +10,10 @@ StartupObject = "GlitchyEngineHelper.Program" BuildCommandsOnCompile = "IfFilesChanged" BuildCommandsOnRun = "IfFilesChanged" LibPaths = ["$(ProjectDir)/out/build/x64-debug/GlitchyEngineHelper.lib"] -PostBuildCmds = ["$(ProjectDir)\\..\\bin\\vscmake.bat x64 $(ProjectDir) x64-debug"] +PreBuildCmds = ["$(ProjectDir)/../bin/vscmake.bat x64 $(ProjectDir) x64-debug"] + +[Configs.Release.Win64] +BuildCommandsOnCompile = "IfFilesChanged" +BuildCommandsOnRun = "IfFilesChanged" +LibPaths = ["$(ProjectDir)/out/build/x64-release/GlitchyEngineHelper.lib"] +PreBuildCmds = ["$(ProjectDir)/../bin/vscmake.bat x64 $(ProjectDir) x64-release"] diff --git a/GlitchyEngineHelper/CMakeLists.txt b/GlitchyEngineHelper/CMakeLists.txt index decfff2..f06ad13 100644 --- a/GlitchyEngineHelper/CMakeLists.txt +++ b/GlitchyEngineHelper/CMakeLists.txt @@ -11,5 +11,4 @@ add_library (GlitchyEngineHelper "GlitchyEngineHelper.cpp" "GlitchyEngineHelper. include_directories("vendor/DirectXTK/Inc") # Use statically linked multithreaded MSVC runtime -set_property(TARGET GlitchyEngineHelper PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDebug") -#$<$:Debug> \ No newline at end of file +set_property(TARGET GlitchyEngineHelper PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/GlitchyEngineHelper/CMakePresets.json b/GlitchyEngineHelper/CMakePresets.json index abf4065..b699737 100644 --- a/GlitchyEngineHelper/CMakePresets.json +++ b/GlitchyEngineHelper/CMakePresets.json @@ -57,5 +57,15 @@ "CMAKE_BUILD_TYPE": "Release" } } + ], + "buildPresets": [ + { + "name": "x64-debug", + "configurePreset": "x64-debug" + }, + { + "name": "x64-release", + "configurePreset": "x64-release" + } ] } diff --git a/bin/vscmake.bat b/bin/vscmake.bat index ddbf191..d296de1 100644 --- a/bin/vscmake.bat +++ b/bin/vscmake.bat @@ -4,6 +4,7 @@ for /f "usebackq tokens=*" %%i in (`vswhere.exe -latest -products * -requires Mi if exist "%%i\VC\Auxiliary\Build\vcvarsall.bat" ( "%%i\VC\Auxiliary\Build\vcvarsall.bat" %1 cd /D %2 - cmake --preset %3 + cmake --preset=%3 + cmake --build --preset=%3 ) )