fix windows build

CMakeLists.txt

@@ -14,6 +14,7 @@ else()
         set(CMAKE_CXX_FLAGS "/Wall")
         set(CMAKE_CXX_FLAGS_DEBUG "/Z7")
         set(CMAKE_CXX_FLAGS_RELEASE "/O2")
+        include(C:/vcpkg/scripts/buildsystems/vcpkg.cmake)
 endif()
 
 

scripts/build.bat

@@ -14,7 +14,7 @@ echo "Building ThirdParty libs..."
 call .\src\ThirdParty\XMP\build_xmp_libraries.bat > build\XMP_build.log
 
 pushd build
-cmake -B . -S .. -DCMAKE_TOOLCHAIN_FILE=%vcpkg_location%/scripts/buildsystems/vcpkg.cmake > build.log
+cmake -B . -S .. > build.log
 
 if "%1"=="-r" (
 	cmake --build . --config Release >> build.log

src/Helpers/QLogger.h

@@ -21,6 +21,9 @@
 
 #ifdef _WIN32
 #define stat _stat
+#define NOMINMAX
+#include <Windows.h>
+#include <processthreadsapi.h>
 #endif
 
 enum class LOGLEVEL { DBG1, DBG2, DBG3, DBG4, TRACE, INFO, WARN, ERR };
@@ -40,7 +43,13 @@ class QLogger {
    * Construct the log as a string and push to the logging queue
    */
   template <typename T, typename... Args> void Log(LOGLEVEL logLevel, T message, Args... args) {
-    unsigned long thread_id = pthread_self();
+
+    #ifdef _WIN32
+      unsigned long thread_id = GetCurrentThreadId();
+    #else
+      unsigned long thread_id = pthread_self();
+    #endif
+
 
     std::thread([this, thread_id, logLevel, message, args...]() {
       std::ostringstream log_buffer;

src/ThirdParty/XMP/build_xmp_libraries.bat

@@ -20,11 +20,12 @@ if not exist "XMP-Toolkit-SDK\" (
     :: Setup zlib
     powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://www.zlib.net/current/zlib.tar.gz', 'zlib.tar.gz')"
     :: Extract and copy .c and .h files
-    tar -xzvf zlib.tar.gz
-    move zlib.tar.gz\*.c XMP-Toolkit-SDK\third-party\zlib
-    move zlib.tar.gz\*.h XMP-Toolkit-SDK\third-party\zlib
-    del zlib.tar.gz.tar.gz
-    rmdir zlib* /s /q
+    mkdir zlib
+    tar -xzvf zlib.tar.gz -C zlib --strip-components=1
+    move zlib\*.c XMP-Toolkit-SDK\third-party\zlib
+    move zlib\*.h XMP-Toolkit-SDK\third-party\zlib
+    del zlib.tar.gz
+    rmdir zlib /s /q
 
     :: Set up libexpat
     git clone https://github.com/libexpat/libexpat