[Bf-blender-cvs] [cebf728] master: Add sqlite3 dll's on windows. Fix T41144

Martijn Berger noreply at git.blender.org
Sun Aug 31 09:10:59 CEST 2014


Commit: cebf7282504280140cdc9cbf85c79b03fdc14c10
Author: Martijn Berger
Date:   Sun Aug 31 09:08:07 2014 +0200
Branches: master
https://developer.blender.org/rBcebf7282504280140cdc9cbf85c79b03fdc14c10

Add sqlite3 dll's on windows.
Fix T41144

===================================================================

M	SConstruct
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/SConstruct b/SConstruct
index b63d650..c74caa2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1137,8 +1137,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
     if env['WITH_BF_PYTHON']:
         if env['BF_DEBUG']:
             dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
+            dllsources.append('${BF_PYTHON_LIBPATH}/sqlite3_d.dll')
         else:
             dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
+            dllsources.append('${BF_PYTHON_LIBPATH}/sqlite3.dll')
 
     if env['WITH_BF_ICONV']:
         if env['OURPLATFORM'] == 'win64-vc':
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 87ba725..b32aa46 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -597,13 +597,13 @@ elseif(WIN32)
 		string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 
 		install(
-			FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
+			FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll ${LIBDIR}/python/lib/sqlite3.dll
 			DESTINATION ${TARGETDIR}
 			CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
 		)
 
 		install(
-			FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
+			FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll ${LIBDIR}/python/lib/sqlite3_d.dll
 			DESTINATION ${TARGETDIR}
 			CONFIGURATIONS Debug
 		)




More information about the Bf-blender-cvs mailing list