projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
37fab4a
)
Copy zlib.dll for win64 too.
author
Nathan Letwory <nathan@letworyinteractive.com>
Wed, 26 May 2010 11:25:33 +0000
(11:25 +0000)
committer
Nathan Letwory <nathan@letworyinteractive.com>
Wed, 26 May 2010 11:25:33 +0000
(11:25 +0000)
SConstruct
patch
|
blob
|
history
diff --git
a/SConstruct
b/SConstruct
index ffcfdc10436d45bf955b36e64ff0ffdd1f086b37..0d8f6f96d7219713654e310943d08e8b0fc437ef 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-569,9
+569,9
@@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
#currently win64-vc doesn't appear to have libpng.dll
if env['OURPLATFORM'] != 'win64-vc':
- dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
- '${BF_ZLIB_LIBPATH}/zlib.dll']
+ dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
+ dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']