build system improvements

Artikash · Mar 13, 2021 · aa0c0e0 · aa0c0e0
1 parent 74121d7
commit aa0c0e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -7,20 +7,18 @@ environment:
   matrix:
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     arch: x64
-    msvc_name: Visual Studio 16 2019
     platform: x64
     qtbin: msvc2017_64
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     arch: x86
-    msvc_name: Visual Studio 16 2019
     platform: Win32
     qtbin: msvc2017
 
 before_build:
   - cd C:\
   - mkdir %arch%
   - cd %arch%
-  - cmake -G "%msvc_name%" -A "%platform%" -DQt5_DIR="C:\Qt\5.13\%qtbin%\lib\cmake\Qt5" -DCMAKE_BUILD_TYPE="RelWithDebInfo" ../Textractor
+  - cmake -G "Visual Studio 16 2019" -A "%platform%" -DQt5_DIR="C:\Qt\5.13\%qtbin%\lib\cmake\Qt5" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DVERSION="" ../Textractor
 
 build:
   project: C:\%arch%\Textractor.sln

diff --git a/deploy.ps1 b/deploy.ps1
@@ -1,8 +1,8 @@
 param([string]$version)
 
 cd $PSScriptRoot;
-mkdir -Force -Verbose Builds;
-cd Builds;
+mkdir -Force -Verbose builds;
+cd builds;
 mkdir -Force -Verbose x86;
 mkdir -Force -Verbose x64;
 
@@ -85,6 +85,7 @@ foreach ($arch in @("x86", "x64"))
 	{
 		copy -Force -Recurse -Verbose -Destination "Runtime/$arch/$file" -Path "Release_$arch/$file";
 	}
+	copy -Force -Recurse -Verbose -Destination "$arch" -Path "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Redist/MSVC/**/$arch/Microsoft.VC142.CRT/*"
 }
 
 rm -Force -Recurse -Verbose "Textractor";

diff --git a/extensions/network.cpp b/extensions/network.cpp
@@ -62,4 +62,4 @@ std::string Escape(const std::string& text)
 	return escaped;
 }
 
-TEST(assert(JSON::Parse<wchar_t>(LR"([{"string":"hello world","boolean":false,"number":1.67e+4,"null":null,"array":[]},"hello world"])")))
+TEST(assert(JSON::Parse<wchar_t>(LR"([{"string":"hello world","boolean":false,"number":1.67e+4,"null":null,"array":[]},"hello world"])")));
diff --git a/include/common.h b/include/common.h
@@ -139,7 +139,7 @@ inline void TEXTRACTOR_DEBUG(const wchar_t* format, const Args&... args) { std::
 void Localize();
 
 #ifdef _DEBUG
-#define TEST(...) static auto _ = CreateThread(nullptr, 0, [](auto) { __VA_ARGS__; return 0UL; }, NULL, 0, nullptr); 
+#define TEST(...) static auto _ = CreateThread(nullptr, 0, [](auto) { __VA_ARGS__; return 0UL; }, NULL, 0, nullptr)
 #else
 #define TEST(...)
 #endif