From 44eb9c79266c2683eba7fe0ae5c019412129bf5a Mon Sep 17 00:00:00 2001 From: OV2 Date: Sun, 24 Jun 2018 13:12:59 +0200 Subject: [PATCH] win32: include ddraw libs, compile with ddraw support by default --- .gitignore | 4 ++++ win32/CDirectDraw.cpp | 7 ++++++- win32/ddraw/ddraw_x64.lib | Bin 0 -> 4312 bytes win32/ddraw/ddraw_x86.lib | Bin 0 -> 4540 bytes win32/snes9xw.vcxproj | 8 ++++---- 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 win32/ddraw/ddraw_x64.lib create mode 100644 win32/ddraw/ddraw_x86.lib diff --git a/.gitignore b/.gitignore index f55fc3c9..407258c9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,10 @@ win32/BIOS !macosx/libz_u.a !macosx/libHIDUtilities_u.a +# Included libraries in windows that should not be ignored. +!win32/ddraw/ddraw_x86.lib +!win32/ddraw/ddraw_x64.lib + # Created by https://www.gitignore.io/api/c,c++,visualstudio ### C ### diff --git a/win32/CDirectDraw.cpp b/win32/CDirectDraw.cpp index 0af15b93..2203bce0 100644 --- a/win32/CDirectDraw.cpp +++ b/win32/CDirectDraw.cpp @@ -190,7 +190,12 @@ ***********************************************************************************/ #if DIRECTDRAW_SUPPORT -#pragma comment( lib, "ddraw" ) + +#ifdef _WIN64 +#pragma comment( lib, "ddraw/ddraw_x64" ) +#else +#pragma comment( lib, "ddraw/ddraw_x86" ) +#endif // CDirectDraw.cpp: implementation of the CDirectDraw class. // diff --git a/win32/ddraw/ddraw_x64.lib b/win32/ddraw/ddraw_x64.lib new file mode 100644 index 0000000000000000000000000000000000000000..c7d77b324263a965bc5227975273ac2f32d79d6a GIT binary patch literal 4312 zcmcIn&2JM&6#tQs4}T^=d#GqrgE-J0Qj^#?ND;D=bxTAD$Vrq7lG%Ef#_GnlwhoQd zL!};aKs_Mt+uF}*dpp0Gx9|66d}+~i z8{0RNKjebXwfv3w`Ft^7x)Idp#jsSG6TJsX0N()PPl3q;An_JRzw;&Y5@5+L`ZDzd zU`aprB}M)$=^0-#_sO4R+VLg(oZcguB0I}8L9wKkSnBnaJNNF^HtI%oeYv)BZ{u#Q zZWy)77V7o2&DGUGGye4KzIEf)=GyJLQQ4@#Xu5WzYq;j`%dTy9ZJMCD)2R=r`xVu_ z2v0I--)d`j$98Gj%7Ax|Da4;Q5?qJ!--5B;-fda8Y^Ni=w8Ah}T3y?1na*mv@vF24 zmD*>s<%D?&wO*GWn`Nij>DaEEv@def`jg#V-*q3F4f{v8y<;p3_W`w@U2Uzp7ZWEo zhQ1RMtLoks2-q;hiYO+gqZibtHw^Nvbh~C_+qUEz4e1|cJu-h5G=DgwpN<0ulfc^q z@GcF!%m9m7;K>y5n8pVwV20ZJq<83r=VY598`EKlY(zlnCXmD=&LV{|j3a|ACNPCG z&R`_QI*O=W=^XL$NDpOh^rT#0BJ_NvVBYAj=j)@WqWuDy5vnFOD0t-^_R$CO?-(^i zaPp8ei6vl=aXN_obdRk@l4{{Eg_I^0nM3&1KcRY$i42E|Lgn8T49|0N{17fOyV5t{!7vPl2G^Xzz4rp^u*ZfsY@1 z{mBu$vJuGrmH}_A+fw80%tsME1@@trpnQs2!+JWJ)x)y`B{gQOH5wg*X{VGSa|L;c zd62aBN4yOAmsaGjG(1DBp7nFLCqw3?i8JIMIS?&p2+w=kUw)V`%4b02%_pg{V@O`j zEzA$_>VHCri&_k?iXuQBFPT@pPZ?#&tAf-se_zXiXxZI#5XN{?+|D839#ZaBN2inF8~@+^@ilQDvW)($dx1+g2;EZ zpDR{t5780qfh{CBjRG<9UBCJ`Z9h3Xv|aCqRseX*L}3M0kaT haMpcIF+E3kgSS7uIn^6BJ7cQJ1s^MTqf`J$egZ*l3C{ok literal 0 HcmV?d00001 diff --git a/win32/ddraw/ddraw_x86.lib b/win32/ddraw/ddraw_x86.lib new file mode 100644 index 0000000000000000000000000000000000000000..57f83d6452306b95fc8ce5ab203c7a8d28c2f263 GIT binary patch literal 4540 zcmcInJ9FDc5dKJ6rbvko#c48m(H=SDxKQ*UC3+^40V623Y+CkE(x}SN2nk1YD3XIf z6Iafp&o6MD%C(D>o^hKZMM@R^5w2X=-UIFdfCmV)ots(QVRsMT-QMor;^McK(>?mG z@J%(`R#&dAudmeVjny!Jg}*j78hmuG0N`^V*9P(~P7Qm?dh|^2zi7KSSX#N$WPG{%#-8=35j=8r%afXWqmyCphCLVucM@ir=FZTyouM^ojk>=C zzB$2Hng_!H)2+!>OI;;VEB0-$bah;@r2o_7BeJ*xU+C(~1W?)u=f>v~R)?8nK7Gs)xrDQ*A5SXTynI`d@u4{FV?4Fp}4bDr@m^wZ;ReV+` zK-)RM%>z#gz|$h|xI__G1|E>`CcTd-LQjd7h~HWS9+B)N(J9Ga&3gfk3i2pm4(BkB zS)4}^CFD@X0y4-ZNM|U%685gVOZcJU1iUKZyb%}jtgp^<((|ISGlEj7Pq>v<=9x?et1xtwuguLQVWTG`M7<~&*m{ka#3_xQoFP+0`WfLI z$ff#2@|UeUs+haPyJ41lg8>iOvu@H_V?*Agt;`H&|G3(m%Yfp{YnkPq{nN?MOMCt+ zV9?-C@xprpmG77PJuqp0MKti5=!IZVZ=m`tOFfHt z*79;wS8$<1sRZn6tmSC_^YTZx`(0=B>*&5)z0&@=+S=K@<%=UvN-*9`_61NLVe?sb zn)OB!1V(psJf?*{FaL-)Zv-0CXN|2a3$b4V@YZ@HINr|K`ep>D#&n1QsZ&=R#{Ysn zcw=7&Hu)Rtve>2PhpRT^K2v(gTJ2iEL$aQS{Ozratqxib>3Jgc2zbc4;4%;SOT6%& zdC329@@Y<#ib%3@OyyRX+G?BifYtoC`i~I&^VM4|A+GAeP|OQiTm@Sou4;nM^!^nu zy#J8aO=Hnd2{$H9O>NJ*C@89|;%8CW%CKDZ6=9sC8X)P8muCk#O6mKx7}U=Qb=F6X zRIw6aYOK2WxrywMWry=&EO}ABJ6cV+X9VpNLd$t*q03hRO@DIoA1-`yUlP)shomW{ z-Ulz{%$TR-b$Ed?LBYyVN>8b;^Kg&Y^CF=Zbf|vmAz?7RU2A&8ON2NdMhw+63Q~^J z?r~F(c$p9vVi0+aB%$76p9!eNSX8g@dLPsT>y~0rSv991 Disabled $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) - _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions) + _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;DIRECTDRAW_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDebug Default @@ -163,7 +163,7 @@ Disabled $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) - _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;%(PreprocessorDefinitions) + _DEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;DIRECTDRAW_SUPPORT;%(PreprocessorDefinitions) MultiThreadedDebug Default @@ -217,7 +217,7 @@ true true $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) - NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;%(PreprocessorDefinitions) + NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;DIRECTDRAW_SUPPORT;%(PreprocessorDefinitions) true MultiThreaded Default @@ -270,7 +270,7 @@ true true $(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;%(AdditionalIncludeDirectories) - NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;%(PreprocessorDefinitions) + NDEBUG;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;DIRECTDRAW_SUPPORT;%(PreprocessorDefinitions) true MultiThreaded Default