From d2900760cc3598b280585250fa34d4dc91fcc284 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Wed, 26 Feb 2020 22:38:33 -0500 Subject: [PATCH] Fix compilation with static SDL 2.0.10 --- SConscript | 2 +- vsproject.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SConscript b/SConscript index 3d5247b5d..2c5bad32b 100644 --- a/SConscript +++ b/SConscript @@ -227,7 +227,7 @@ def findLibs(env, conf): if msvc: libChecks = ['shell32', 'wsock32', 'user32', 'Advapi32', 'ws2_32', 'Wldap32', 'crypt32'] if GetOption('static'): - libChecks += ['imm32', 'version', 'Ole32', 'OleAut32'] + libChecks += ['imm32', 'version', 'Ole32', 'OleAut32', 'SetupApi'] for i in libChecks: if not conf.CheckLib(i): FatalError("Error: some windows libraries not found or not installed, make sure your compiler is set up correctly") diff --git a/vsproject.py b/vsproject.py index f2b3a9f96..db032aaa9 100755 --- a/vsproject.py +++ b/vsproject.py @@ -179,7 +179,7 @@ vcxproj.write(r""" Windows true true - SDL2.lib;SDL2main.lib;shell32.lib;libbz2.lib;pthreadVC2.lib;luajit2.0.lib;libfftw3f-3.lib;zlib.lib;libcurl.lib;ws2_32.lib;Wldap32.lib;crypt32.lib;winmm.lib;dxguid.lib;imm32.lib;version.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;shell32.lib;libbz2.lib;pthreadVC2.lib;luajit2.0.lib;libfftw3f-3.lib;zlib.lib;libcurl.lib;ws2_32.lib;Wldap32.lib;crypt32.lib;winmm.lib;dxguid.lib;imm32.lib;version.lib;SetupApi.lib;%(AdditionalDependencies) UseLinkTimeCodeGeneration