diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52ccd1c34..5539c2096 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,6 +112,66 @@ build:linux:avx2:
   variables:
     <<: *build_variables
     URDE_VECTOR_ISA: avx2
+    
+.build:win32: &win32_definition
+  stage: build
+  tags:
+    - win32
+  script:
+    - set PATH=%PATH%;"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64"
+    - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+    - mkdir build
+    - cd build
+    - >
+      cmake
+      -GNinja
+      -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      -DURDE_DLPACKAGE=urde-%CI_PIPELINE_ID%-win32-x86_64-%URDE_VECTOR_ISA%
+      -DURDE_VECTOR_ISA=%URDE_VECTOR_ISA%
+      ..
+    - ninja urde hecl visigen
+    - cp Editor\urde.exe %CI_PROJECT_DIR%\urde.exe
+    - pdbcopy Editor\urde.pdb %CI_PROJECT_DIR%\urde.pdb -p
+    - cp hecl\driver\hecl.exe %CI_PROJECT_DIR%\hecl.exe
+    - pdbcopy hecl\driver\hecl.pdb %CI_PROJECT_DIR%\hecl.pdb -p
+    - cp visigen\visigen.exe %CI_PROJECT_DIR%\visigen.exe
+    - pdbcopy visigen\visigen.pdb %CI_PROJECT_DIR%\visigen.pdb -p
+  only:
+    - release
+  artifacts:
+    name: "urde-$CI_PIPELINE_ID-win32-x86_64-$URDE_VECTOR_ISA"
+    paths:
+      - urde.exe
+      - urde.pdb
+      - hecl.exe
+      - hecl.pdb
+      - visigen.exe
+      - visigen.pdb
+    expire_in: 1 week
+
+build:win32:sse2:
+  <<: *win32_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: sse2
+
+build:win32:sse41:
+  <<: *win32_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: sse41
+
+build:win32:avx:
+  <<: *win32_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: avx
+
+build:win32:avx2:
+  <<: *win32_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: avx2
 
 deploy:
   stage: deploy
diff --git a/hecl-gui b/hecl-gui
index ae8164601..26cbd447f 160000
--- a/hecl-gui
+++ b/hecl-gui
@@ -1 +1 @@
-Subproject commit ae8164601718ae079ce94a099a9d8e79755920af
+Subproject commit 26cbd447f71bee9be9daefbc486782a614775db4
diff --git a/visigen/MainWin.cpp b/visigen/MainWin.cpp
index 293c45b06..4d9f9c9cb 100644
--- a/visigen/MainWin.cpp
+++ b/visigen/MainWin.cpp
@@ -50,7 +50,7 @@ static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
 
 int wmain(int argc, const hecl::SystemChar** argv)
 {
-    if (argc > 1 && !_wcscmp(argv[1], L"--dlpackage"))
+    if (argc > 1 && !wcscmp(argv[1], L"--dlpackage"))
     {
         printf("%s\n", URDE_DLPACKAGE);
         return 100;