Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2014-07-31 18:43:02 +0400
committerMartijn Berger <martijn.berger@gmail.com>2014-07-31 18:43:02 +0400
commitbcbbed0ccf875160a9927a951aef9c845a63ba0a (patch)
tree03d52eae8dacda1590c1a634549ccb913a7c5c98 /SConstruct
parenteb016eb3ae799e5c86778ba996f54257f84e80a4 (diff)
Use dynamically linked SDL 1.2.15 on windows x64
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct5
1 files changed, 1 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 91ade7ec0cd..055409a3dba 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1101,10 +1101,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
if env['WITH_BF_SDL']:
- if env['OURPLATFORM'] == 'win64-vc':
- pass # we link statically already to SDL on win64
- else:
- dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
+ dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
if env['WITH_BF_PYTHON']:
if env['BF_DEBUG']: