From 32aa4bfdd0c206a2155af61b117c20beaafde762 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Fri, 29 Jan 2021 10:29:13 +0000
Subject: [PATCH] (.gitlab-ci.yml) Add windows-x64 target

---
 .gitlab-ci.yml              | 17 +++++++++++++----
 libretro/Makefile           |  4 ++--
 libretro/README_WINDOWS.txt |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d1dc23e70..f199fd1b9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,26 +11,35 @@ variables:
   variables:
     EXTRA_PATH: lib
 
+.windows-defs:
+  variables:
+    MAKEFILE_PATH: libretro
+
 include:
-  - template: Jobs/Code-Quality.gitlab-ci.yml
   - project: 'libretro-infrastructure/ci-templates'
     file: '/android-cmake.yml'
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-cmake.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/windows-x64-msvc19-msys2.yml'
 
 stages:
   - build-prepare
   - build-shared
-  - build-static
-  - test
 
-#Desktop
+# Desktop
 libretro-build-linux-x64:
   extends:
     - .libretro-linux-cmake-x86_64
     - .core-defs
     - .linux-defs
 
+libretro-build-windows-x64:
+  extends:
+    - .libretro-windows-x64-msvc19-msys2-make-default
+    - .core-defs
+    - .windows-defs
+
 # Android
 libretro-build-android-armeabi-v7a:
   extends:
diff --git a/libretro/Makefile b/libretro/Makefile
index a047d9a2e8..fe37b49e98 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -304,7 +304,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
 	filter_out1 = $(filter-out $(firstword $1),$1)
 	filter_out2 = $(call filter_out1,$(call filter_out1,$1))
 
-	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
+	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>null)))
 	fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
 
 	b1 := (
@@ -415,7 +415,7 @@ else ifneq (,$(findstring windows_msvc2019,$(platform)))
 	filter_out1 = $(filter-out $(firstword $1),$1)
 	filter_out2 = $(call filter_out1,$(call filter_out1,$1))
 
-	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
+	reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>null)))
 	fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
 
 	b1 := (
diff --git a/libretro/README_WINDOWS.txt b/libretro/README_WINDOWS.txt
index 755658dca4..124a283fa3 100644
--- a/libretro/README_WINDOWS.txt
+++ b/libretro/README_WINDOWS.txt
@@ -13,7 +13,7 @@ pacman -S make
 Then use the following in msys:
 
 cd libretro
-make platform=windows_msvc2019_desktop_x64 -j32 && cp ppsspp_libretro.* /d/retroarch/cores && rm nul
+make platform=windows_msvc2019_desktop_x64 -j32 && cp ppsspp_libretro.* /d/retroarch/cores && rm null
 
 Note that the latter part copies the DLL/PDB into wherever retroarch reads it from. Might need to adjust the path,
 and adjust -j32 depending on your number of logical CPUs - might not need that many threads (or you might need more...).