From a8a1c67df0451a7cc8ec98610e3ea30abd1eb23f Mon Sep 17 00:00:00 2001 From: sorgts Date: Thu, 13 Aug 2020 16:48:48 +0200 Subject: [PATCH] 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=+is&U5Pe7DA4c>gk=ztW)291I0%>WJfMU{3rIjKA4q;2MWuV=x_ILJ6_Q!UB z?4_+*3t^8vbI!~eTUE}^f?Zm`Hq98|oaRwh#Vp1J2vHP5^kf9jX}JUKc&7DKq6ZW9He`bh5B!PHRuxm1ENfiq>bk_C0^;x66B%x+4T=_Q#eVxZb=q(0k_0 zm#Xq-SF<*}Dm7JUXodu|83npySq65NXiZ*qcHeYW89CSPTvY&v?M(b7y%{Zo0HFai z?@lAG?cEXcyibgCoeXrGT4#6M_|$RDaBX+(`;_`VhK$!VumX2X44qsN(;y}?)o#Ff42+J676y%p3- zG%I_r)13dAS%3e$wpaF!ab#buVkU z{@VE){8PRjJXh>SHnstyZ$tJ$M%`|>X`|uF7Fd;?GU)5LzAjwT8YN@I(7b@G27K2p zK{_+6WM|5kfkwXRD_fCqW*fF?hi-J`!v!cr{S(SO;x$f>uXg}esh>TOd!26linN{GeU~6US z^caqqZ!@t#vI2bp`4#k+-Hu5~LAG=sAW!kQPn&_a4nAX0$T-EFH|y?y2HRy{48AR5 z++|(l--cfCnT*<^{a`OWo9Nueq66PW&}kGoExB*8?LebUI!dh8eTMa}%N1@~XDx5b z#6JrT%dTt1|Jq4UD!GhjLLuGXpCzyCv8~`qj13iJ>a^fE9uWscu;7~H(|f+W=RiL3 zDV4bgr7}i{KQ=NhJ=LNprFxFxtD-$1l}$WSoO9?}bFGtJ&DK-^y8#t7qz2j`q^f&M zEzB{8O4|Xop5I?^R)w|+aa&|mW|aLGKh3-3=_$<|=qfVKLH`bnSOmHN`*G;&IHjNn1XzB^~1 zzR`2O5nbX7Yjr=#Y}qAM&_&x7(j+16iD9SiH6|Lm??BOGrCO-5QY6)}q@&B-09lH< z&=|lqdpT|I`p$|V)~ zvb-u#b1@wv;G{S0l1M6>^sWRvBhU?RU0OSOD-PjPy;q;KP&K@kWPY&sxtSj#7SoY- zu`<-|8*Ee#hul(SpS#V}cY}bZs|0+Tna; TAD)c0v@SoAqk4ObUOoQ+k-AYt diff --git a/Windows/version.rc b/Windows/version.rc index dbefa2cef81bddf6eee3566d166fad2fdea2a9c0..1c6d3982b19d71cfa8fbbfaafc438cafe9b154ad 100644 GIT binary patch literal 1214 zcmb7D+is&U5Pgr7e;BbZt<+Gb%665ECucT}^ply!VQtWH~o?nl?d>f=b2ve1wF__iRrk%rJ{IWkV0f zRkfihH^FveF9XMOw~jmYpxNkkw*ymWZZ{F|{UGrD?GML2Rao9)F;Xyp=}p$w>Jvy! zIGvAX!D19V0eS0xn`?b>gfVO<_IN#OPOU&1p!1lP_*a}%aUQX_NqB)m4^*@gz540f zYOhh%K3I=0LSuX8xGJN*@!YeXzzC#ZJejIiIXuplGga;kyMU4b8Ir*>X+SMN9omfM zYa0wJ&obn)H15Et4Fo^%0keHdWiBo_u8RuFk1own*L_DW*b6L=QS$qjh}vtk^a+-s zV1-n(aX#H+@LT`R_wpb=(Nyj0$f(i94jNBd9$SH6`%1%ff2 z78pwQijW`F(<#k%*`AWi)Gf8Kn(^$YiEr3mdiCFV*1H1EQV_8Qwu(HQ<7_;{F3hW=He@ literal 2486 zcmcJR-HsAL5QXd7#CMpCH<}2thG@LxUm`9WK#W&pmp_Rx5MbT)fqf12t7@8NfF)tG zX2ML*bk(WTRi~@@`{%hllQ&$EbmY5CWW{L2b1Fkd?tLhU^kpssz76ba!u<;#RmsSO zypz|w-;w0dzEptH{-wS`XVgq(!ewA9my3}n@gWP`D$o~ zF-qWn<|-H$^=k2@OpQxa`Drjc!zw%rQiGGmYs)9t=j0w8y=O*Oqxl9!>Z;+x*5hWV$2Y$WvuA@3F#s8^%Sl zcg(7YU(IUa;zgiDSU1Re$ubfXd5ua{v16+1c4VEm5vp~XabD_o3@yy=qUIz|wmhc(%ctt-T)Jg-1imTED=YR3MaitaP*3&(k! zinPEtp^IGd)Tln*M`NIw`$3!*76UT)n;3($qWGMb!CSGv6>$Mu*EM{!-TigW8a#Rz z^w5hO>MrKPd$x_XTBaetFMPJr&vcbkLE3|tJg>?Be)e`_SFA?otf~R>*l<-13v#bn z8`ELe+xi^NMDh~#yrNofQDlzuBx9osbQ+;jJt>~5s)1n#Zr9djW;~auC1|!lW~M}4 z@LkWnTk5YTndVHjrl+L(=ozWIbRQ?eOMBOvl@H0llCfIr*)=q*iJd}fcL%D|K=v$s zHbK+XWRAUf!GoZeJXJN%!5ZRn}+o jF&#I(