diff --git a/buildSFML.bat b/buildSFML.bat deleted file mode 100644 index f05a0c1..0000000 --- a/buildSFML.bat +++ /dev/null @@ -1,11 +0,0 @@ -cd deps/SFML - -if "%APPVEYOR%"=="" ( -cmake.exe -S . -B out/Debug -DCMAKE_BUILD_TYPE=Debug -cmake.exe --build out/Debug --config Debug -) - -cmake.exe -S . -B out/Release -DCMAKE_BUILD_TYPE=RelWithDebInfo -cmake.exe --build out/Release --config RelWithDebInfo - -cd ../.. \ No newline at end of file diff --git a/buildSFML.ps1 b/buildSFML.ps1 new file mode 100644 index 0000000..2626a3e --- /dev/null +++ b/buildSFML.ps1 @@ -0,0 +1,13 @@ +cd deps/SFML + +if ($env:APPVEYOR = ="") { + cmake.exe -S . -B out/Debug -DCMAKE_BUILD_TYPE=Debug + cmake.exe --build out/Debug --config Debug +} + +$env:_CL_ = "/MDd" +cmake.exe -S . -B out/Release -DCMAKE_BUILD_TYPE=RelWithDebInfo +$env:_CL_ = "/MD" +cmake.exe --build out/Release --config RelWithDebInfo + +cd ../.. \ No newline at end of file diff --git a/buildViGEmClient.bat b/buildViGEmClient.ps1 similarity index 84% rename from buildViGEmClient.bat rename to buildViGEmClient.ps1 index 46f2bb4..f14a3b2 100644 --- a/buildViGEmClient.bat +++ b/buildViGEmClient.ps1 @@ -2,7 +2,9 @@ cd deps/ViGEmClient git apply ../../ViGEm_BuildConfig.patch +$env:_CL_="/MDd" msbuild.exe ViGEmCLient.sln /t:Build /p:Configuration=Debug_LIB /p:Platform=x64 +$env:_CL_="/MD" msbuild.exe ViGEmCLient.sln /t:Build /p:Configuration=Release_LIB /p:Platform=x64 cd ../.. \ No newline at end of file diff --git a/prebuild.ps1 b/prebuild.ps1 index e8098ae..1472704 100644 --- a/prebuild.ps1 +++ b/prebuild.ps1 @@ -1,8 +1,8 @@ git submodule init git submodule update --recursive -cmd.exe /c buildSFML.bat -cmd.exe /c buildViGEmClient.bat +.\buildSFML.ps1 +.\buildViGEmClient.ps1 cd deps/traypp