From 60d249a9090b4942c371c9c1557684f21b096336 Mon Sep 17 00:00:00 2001
From: sorgts <sorgts@googlemail.com>
Date: Wed, 12 Aug 2020 20:15:32 +0200
Subject: [PATCH 1/4] Fix Windows/CMake build with Visual Studio

---
 CMakeLists.txt           | 25 +++++++++++++++----------
 Windows/InputDevice.cpp  |  1 +
 Windows/WASAPIStream.cpp |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0137d06d5a..76e754e72d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -915,6 +915,7 @@ if(WIN32)
 	set(THIN3D_PLATFORMS ${THIN3D_PLATFORMS}
 		ext/native/thin3d/thin3d_d3d9.cpp
 		ext/native/thin3d/thin3d_d3d11.cpp
+		ext/native/thin3d/d3d9_d3dcompiler_loader.cpp
 		ext/native/thin3d/d3dx9_loader.cpp
 		ext/native/thin3d/d3dx9_loader.h
 		ext/native/thin3d/d3d11_loader.cpp
@@ -1848,8 +1849,6 @@ if(USE_MINIUPNPC)
 	if (NOT WIN32)
 	  add_definitions (-DMINIUPNPC_SET_SOCKET_TIMEOUT)
 	  add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L)
-	else()
-	  add_definitions (-D_WIN32_WINNT=0x0501) # XP or higher for getnameinfo and friends
 	endif()
 	if (MACOSX)
 	  add_definitions (-D_DARWIN_C_SOURCE)
@@ -1897,25 +1896,31 @@ if(USE_MINIUPNPC)
 	#  find_library (RESOLV_LIBRARY NAMES resolv)
 	#  set (LDLIBS ${SOCKET_LIBRARY} ${NSL_LIBRARY} ${RESOLV_LIBRARY} ${LDLIBS})
 	endif()
-	if (MSVC)
-		# Suppress noise warnings
-		target_compile_definitions(miniupnpc _CRT_SECURE_NO_WARNINGS _WINSOCK_DEPRECATED_NO_WARNINGS)
-	endif()
 	if (UPNPC_BUILD_STATIC)
 		add_library(miniupnpc STATIC ${MINIUPNPC_SOURCES})
 		target_link_libraries(${CoreLibName} miniupnpc ${LDLIBS})
 		set(UPNPC_LIBRARY miniupnpc)
+		if (MSVC)
+			# Suppress noise warnings
+			target_compile_definitions(miniupnpc PRIVATE _CRT_SECURE_NO_WARNINGS _WINSOCK_DEPRECATED_NO_WARNINGS)
+		endif()
 	endif()
 endif()
 
 setup_target_project(${CoreLibName} Core)
 
-# Generate git-version.cpp at build time.
-add_custom_target(GitVersion ALL
-	DEPENDS something_that_never_exists)
+# Generate git-version at build time.
+add_custom_target(GitVersion DEPENDS something_that_never_exists)
+
+set(WIN_VERSION_CMD "")
+if (WIN32)
+	set(WIN_VERSION_CMD COMMAND ${CMAKE_SOURCE_DIR}/Windows/git-version-gen.cmd PPSSPPWindows)
+endif()
+
 add_custom_command(OUTPUT something_that_never_exists
 	COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-		-P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake)
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake
+	${WIN_VERSION_CMD})
 
 set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp
 	PROPERTIES GENERATED TRUE
diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp
index 3c59c8323e..d800c87713 100644
--- a/Windows/InputDevice.cpp
+++ b/Windows/InputDevice.cpp
@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "stdafx.h"
 #include <thread>
 #include <atomic>
 
diff --git a/Windows/WASAPIStream.cpp b/Windows/WASAPIStream.cpp
index d399781c46..9662bf2891 100644
--- a/Windows/WASAPIStream.cpp
+++ b/Windows/WASAPIStream.cpp
@@ -1,3 +1,4 @@
+#include "stdafx.h"
 #include "WindowsAudio.h"
 #include "WASAPIStream.h"
 #include "Common/Log.h"

From 0ae12da3a7c58de41324ad19532e3bc3217d0c85 Mon Sep 17 00:00:00 2001
From: sorgts <sorgts@googlemail.com>
Date: Thu, 13 Aug 2020 16:48:19 +0200
Subject: [PATCH 2/4] Fix SSE detection with clang-cl

clang-cl advertises its SSE support through the macros and expects the
program to adhere to them, so check if any macro definition is available
before falling back to the latest level as a default
---
 Common/Common.h | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Common/Common.h b/Common/Common.h
index 9fffa42922..9894771c53 100644
--- a/Common/Common.h
+++ b/Common/Common.h
@@ -70,18 +70,16 @@
 #define __forceinline inline __attribute__((always_inline))
 #endif
 
-#if !defined(__GNUC__) && (defined(_M_X64) || defined(_M_IX86))
+#if defined __SSE4_2__
+# define _M_SSE 0x402
+#elif defined __SSE4_1__
+# define _M_SSE 0x401
+#elif defined __SSSE3__
+# define _M_SSE 0x301
+#elif defined __SSE3__
+# define _M_SSE 0x300
+#elif defined __SSE2__
+# define _M_SSE 0x200
+#elif !defined(__GNUC__) && (defined(_M_X64) || defined(_M_IX86))
 # define _M_SSE 0x402
-#else
-# if defined __SSE4_2__
-#  define _M_SSE 0x402
-# elif defined __SSE4_1__
-#  define _M_SSE 0x401
-# elif defined __SSSE3__
-#  define _M_SSE 0x301
-# elif defined __SSE3__
-#  define _M_SSE 0x300
-# elif defined __SSE2__
-#  define _M_SSE 0x200
-# endif
 #endif

From a8a1c67df0451a7cc8ec98610e3ea30abd1eb23f Mon Sep 17 00:00:00 2001
From: sorgts <sorgts@googlemail.com>
Date: Thu, 13 Aug 2020 16:48:48 +0200
Subject: [PATCH 3/4] Fix build with clang-cl

---
 CMakeLists.txt               |   4 +++-
 Core/HLE/sceKernel.h         |   2 +-
 Core/HLE/sceKernelModule.cpp |   2 +-
 Windows/InputDevice.cpp      |   2 +-
 Windows/aboutbox.rc          | Bin 2418 -> 1179 bytes
 Windows/version.rc           | Bin 2486 -> 1214 bytes
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76e754e72d..6e51ca995e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -311,7 +311,9 @@ if(NOT MSVC)
 else()
 	# Disable warnings about MS-specific _s variants of libc functions
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-	add_definitions(-MP)
+	if (NOT CLANG)
+		add_compile_options(-MP)
+	endif()
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG")
 endif()
diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h
index 9e2a8ff3ac..c9d4e20d4c 100644
--- a/Core/HLE/sceKernel.h
+++ b/Core/HLE/sceKernel.h
@@ -25,7 +25,7 @@
 
 class PointerWrap;
 
-enum {
+enum : u32 {
 	SCE_KERNEL_ERROR_OK                               = 0,
 	SCE_KERNEL_ERROR_ALREADY                          = 0x80000020,
 	SCE_KERNEL_ERROR_BUSY                             = 0x80000021,
diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
index c049729246..3d096e8a43 100644
--- a/Core/HLE/sceKernelModule.cpp
+++ b/Core/HLE/sceKernelModule.cpp
@@ -72,7 +72,7 @@ enum {
 	PSP_THREAD_ATTR_USER = 0x80000000,
 };
 
-enum {
+enum : u32 {
 	// Function exports.
 	NID_MODULE_START = 0xD632ACDB,
 	NID_MODULE_STOP = 0xCEE8593C,
diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp
index d800c87713..70d4a6ff48 100644
--- a/Windows/InputDevice.cpp
+++ b/Windows/InputDevice.cpp
@@ -27,7 +27,7 @@
 
 static std::atomic_flag threadRunningFlag;
 static std::thread inputThread;
-static std::atomic_bool focused = true;
+static std::atomic_bool focused = ATOMIC_VAR_INIT(true);
 
 inline static void ExecuteInputPoll() {
 	if (host && (focused.load(std::memory_order_relaxed) || !g_Config.bGamepadOnlyFocused)) {
diff --git a/Windows/aboutbox.rc b/Windows/aboutbox.rc
index 1e669a134b7b8236aa39c98cced9566a0eafad2e..43e3b7200515c8b1dc71e5bd7e9879a29d2fd615 100644
GIT binary patch
literal 1179
zcmaJ=-A<f96uu|n9Zv9OO-2jss%!7q1ub=VAr4zLX|kDRj_lM~W-@@5#@FeS^u-z$
zYio@XE;!8je$M&8wmy8wHll)CArV9cqReH(k%K5f>#EZF(B$wS>J2zgXU?H*?P<e`
zErVQfTxnL|;P}XOy?xuVtvC!<!6aE`ljIu0IG82p(KWcFyN9kvz&jq=7R_#E5rlL_
zqwFkMWboJ(^CS#rXP3b|>g%)kItu9xg-5uet29ZMY5({ortxIfbzRZbG)S{JS@Z?H
zq4Q|5w5>mHonWn++Oe&j%$R^Pr$9F-C4{nYcD_1y-(B09MCb9swg3Ra=qz2*Pm^Vq
zB?|y>k_(5#VRAwI(U5o}mmImo8}-fcbl3BI#bLZkQ%cj6#Nl*BvmlG7#B<3h@jc?Z
zJ!+Ok*V!`$!092K%yji7x}<TkAS0KIiRYh?(>Fj<rCTG4O$~#5AJ#2=!qSL4xNLdx
z>!;xW^#-A*25r<g%xmyn&p+sep3IG0G8_{BXh_Cy2nA9?Z5YQbGj|m*gB_hlQ@5aQ
zI~8HTV5Kpy#XW+0DA81hU(0NRfZIm0TAA)6yHy5|H#w_?DwzaUa^QH6Qt2(0HR#4@
zRbd6Hl<n?R)UahOl&Xd`LQ^4!T7j0Vg@SFdf>t%a)viHe!K7?E`NRJw^jv>8qW_fJ
z>jY@}*J|%;-4q3yS4^kx?rIv-1UTkus|{9_Q04Al>Ef9r3C*I*mxN<-G9-SN^&87i
zX-dP34!@@>&G8-vw+69P9QXgHI`-eC`XR--Bl?W2Jdmo<aLz=xvB5uf_jl9JnYn|2
mOEfTeG0iK@@zJ}Q0q5c=?c5+2b@lP3YnP0kHySNM+xiW>5k$NI

literal 2418
zcmbW3ZBH9V6osG9k@_D-?iV5%2OCIez8SxeO#oZ0NfW6O^2=hjS-jTTZc3EDo4=7(
z_spy@lm-!5c)c@oU(UVvoZ+AEzwnF~ykNi;DGMBzq+}$x@SZSZOwNRaiB@Mg&Kb~U
zn>sJ4;`l84F;{E5897TF3s%gTlT)w^K1ST&n3A%jh9lBRA3s&RjMcq}=3~J^&l&||
zMKuo=vvSX_LJh-ae-UlkT+rl@o-()R2OMo8njF*Ph>livgvNjGvO`_(hH_WFVg`KV
zn2xMtE{N%<7ClZG;P|@UIiW{e{=1yf<V04t`&}YF(4kGtN8(`nyS(=4(dV50oz?e5
z#6%p149u55-=ayM0g>|XS@<3A+hU(`E)4h2R%kLJXT_3=PIT934urqLiSmoNA|WFa
z#*8VIje3=}`<oqkIi$l85vO`{;nSu=SJ-0SaHxI^Le_SsLXUUyYkjldRT}KEOO-l%
zin6b7d$azQo+DZte#+I`r}>MxpiiHeSkJ0fTk7M0rYhJ{Bt!F?V%rQf0;ba2F#}DE
zb^M`E<xUi<l0~;T@9A)+F51LY10t()od&NIbraR&ky_-;xuGCs%9XgZ#hB-~z_d4F
zvF(4tamEc3rhKCiqn$WpjNhz`V@^TNpCpXs(`sNjZr{OUjJU0v@6WEf)nH%GgD2u?
zh6!6zFq8^hGo;{?^vQl%u0FdtiFC#EB<FICC8faWq$!3+kn)!-b3QYZ-GUl_Fq8V3
z&xC7MWDHqKuSyNP3~#1@E5_PS$(b<}7lzDKNz+J+k*Ooss=8_5oE3#Ma6uvzW}7MN
z($<vB38`Tz)pMl0R<bkowY<!q<>)nZs5qwFH{!5kqBErj)AFhE^zl6U+M_+JvqM9Z
z@4ILmeA-+Z%S^xiTh$V?)oa9xDO2@hlP3?&RXs5B=jN&<_3WuaHW4}3nj-7SBJ|U(
z@4AvZc31S2jq&zJ85)OQg~|6kc<SW)ip8{fw~qg-?!9@KEyos@nrpk4{jL1`(X3vE
zPX1h0U&u%qtuuN{q7H6r&h2)095K}Y4SvQ<eIBZ=DN@<{lfY?5lZmF(7`r8$|7ZPJ
p^$*w&w}q+qQ>$-zOvJ-YZjV)MzrNu04|A}ndk@U0-MwwG=U<V!QA7X$

diff --git a/Windows/version.rc b/Windows/version.rc
index dbefa2cef81bddf6eee3566d166fad2fdea2a9c0..1c6d3982b19d71cfa8fbbfaafc438cafe9b154ad 100644
GIT binary patch
literal 1214
zcmb7C+iu!G5Pe7TKaAX$L;`0)G!>6v47Flx3md9Fp^ZH@tJrI6y(I8K{gVDzwPwSm
zqEWg}J2U5;xf-2^2Z*<<fs7RhtO3T8VwYkHj6+>FO<h|efj1_%VCtA@8J#b+pm|9l
zsZ!k3G{?KguY~mPjgFxt-x%+`qG(vft*w&Hk)xmzQ+Pf=&g6Tvmm{~5GF6gV9?UDY
zsU+9YX6-B^H}E&EKMOz`>Th&l=6a6yKo~|*7;b*J{)u4+i^bUJK)4L1D?9!KQVGty
z@jP0LqbDHy{x?t6m!+7&X6j5<bDgyXDS(P&(coWx()xMIG93sMdgy5@{uw$zT2z}e
zT1_ro6KC%FMh5_3;sy2-n2{8W=QCEI%d^VVu`}!fN`_=ahR;NU+Q>Cfz4h2zIbhmV
zSt6H>*#+}BKnSA{u-p|?R^meAnp9JM@M(#P_Z_)lFR(nM`R`vMz0FajPq9e^t0k-W
zIp4qG>*E=j-CL`T;-%}WWn4VnlglLvPK)>Yj(s`h?sh5<b6VI{eGn|)N>$j&fIIsh
z282BJ2Bbey2mGmCTg6z=6iX^z+S!ha0%}pEyF>z~B{o0>f;?fM%0O<B2@u%Sm`L`D
zP`z;!jdi>1K(L%~TByM)#q&fh+~aLdc&y-hFdstyYX^=$Juc+*(bv1C;^WiRn~MeI
VO+od6ko}O1y3ijGav|Gl{{cp3NAv&y

literal 2486
zcmcJR+iu!G5Qe|&N_~eFy=kT5KozCRB?ptD5<nQJdW8rWf&vEF(1Zu>YqZslckuyG
zMU{$+#on3!pZ#|Z{{8DMZ@A(LMW06&L?~t~SmLA1vroW;HB)@1@-{#*pihG$Wp4P0
z;#vGBJRbZ4)@)Hk?AWkjO~}?@Jg`SGXTcT+MN=$e{)O-@+2t5DMnoj5L&!u}HG<|W
z<opUa=+h-9d=`r$Kkx~OSg<C*Nku%Dv+CXP$w>3QMdRTxVa3!izRN|TV>{1XI7B(b
zW5f`b9v)3Pv>DN)O@j_9w`1Sy^C=oMY2oH<6kWP_c(RW8CSJ!JH9FjLPsN~h>CvIi
zfExW*!n6@KXi?z~Pxw5(qA2k~na{L@U+XuMyPu&LQOBjqfV<pT6C{gZ{e6~1_<yl4
zrR)Qy!kSgHgJ-a>jcuZIpYL>W&A!D-_B{qv&sbG)xs$ty`IP*swCGS1MGAOq2_=)}
zG)zS{37D}qITL%SGib?f8nwhVC2nPXpp-*Od``t@ckMc)LW_ZDP@u+|6)UNrEfEFj
z3WZDt>U`9>sPI{_V<~l}`$Aj=7CFD3V%jh!U{9N|uv)$^5`k9k2}O@RQ|A06WO@;c
z)x3^R#6%D`Y)#j&Z0Y*C<O~*lnCV3^Y8vx=&3g3dNe<b%$g37VXSLHAq<e5kz?kKc
zdTDM~?&y+JweXn>uFi%Hdr@u9Bin;w$2*Gm)cAnn6D3OAP?UdVZc%1Zyw<HI5%#6a
z>zTG<OvqCzXDcjOqSz41+}kmc`J^?|8Lp?K_R%v^SLry1qgYGt(v!(&L5LD-J-d9t
zTF4aAcFzPR2b_zv?ig+LwA43gGs?zzDnlK7UhpsC>1H&@S6ez?F3FTE>i??(mp1iG
xmpy)y?Yl#{S*zy1blhyk#d#JGnQj+<b;P%$=U&{8^%qpx<bQf5B+(}S{s747Q~3Y@


From abd2a1542c274ec02628367739714fbfa35b6490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 15 Aug 2020 21:36:42 +0200
Subject: [PATCH 4/4] Update .editorconfig to match the encoding of the
 resource files.

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 965fbcf1ee..332927531a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -27,7 +27,7 @@ charset = utf-8-bom
 charset = utf-8-bom
 
 [Windows/{aboutbox.rc,version.rc}]
-charset = utf-16le
+charset = utf-8
 
 [libretro/**.{cpp,h}]
 indent_style = space