From 47dc212cc565ca776fe78d83bd237ffeb8a1e934 Mon Sep 17 00:00:00 2001 From: Christoffer Lerno Date: Thu, 4 Jul 2024 12:35:23 +0200 Subject: [PATCH] Revert further --- .github/workflows/ci.yml | 2 +- install.bat | 12 ++++++++++++ pdb-patch.pl | 2 +- set-env.bat | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5a0ff0..7e0cfb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,4 +49,4 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: - files: ${{steps.BUILD.outputs.DEPLOY_FILE}} \ No newline at end of file + files: ${{steps.BUILD.outputs.DEPLOY_FILE}} diff --git a/install.bat b/install.bat index 4c179ec..2ffb7c3 100644 --- a/install.bat +++ b/install.bat @@ -2,6 +2,18 @@ if not exist %WORKING_DIR% mkdir %WORKING_DIR% +::.............................................................................. + +if /i "%BUILD_PROJECT%" == "llvm" goto :llvm +if /i "%BUILD_PROJECT%" == "clang" goto :clang + +echo Invalid argument: '%1' +exit -1 + +::.............................................................................. + +:llvm + :: download LLVM sources if /i "%BUILD_MASTER%" == "true" ( diff --git a/pdb-patch.pl b/pdb-patch.pl index 3452723..80f4d31 100644 --- a/pdb-patch.pl +++ b/pdb-patch.pl @@ -37,4 +37,4 @@ } open (my $file, ">", $fileName) || die ("Can't open $fileName for writing: $!\n"); -print $file (@body); \ No newline at end of file +print $file (@body); diff --git a/set-env.bat b/set-env.bat index 23dd7f6..80a6a09 100644 --- a/set-env.bat +++ b/set-env.bat @@ -95,14 +95,14 @@ goto :loop :libcmt set CRT=libcmt set LLVM_CRT=MT -set CMAKE_CRT=MultiThreaded<$:Debug> +set CMAKE_CRT=MultiThreaded shift goto :loop :msvcrt set CRT=msvcrt set LLVM_CRT=MD -set CMAKE_CRT=MultiThreaded<$:Debug>DLL +set CMAKE_CRT=MultiThreadedDLL shift goto :loop