diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin-config.py | 1 | ||||
| -rw-r--r-- | config/irix6-config.py | 1 | ||||
| -rw-r--r-- | config/linux2-config.py | 2 | ||||
| -rw-r--r-- | config/linuxcross-config.py | 1 | ||||
| -rw-r--r-- | config/openbsd3-config.py | 1 | ||||
| -rw-r--r-- | config/sunos5-config.py | 1 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 4 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | config/win64-vc-config.py | 2 |
9 files changed, 4 insertions, 11 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 92f70d716fc..981f321e5bc 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -274,4 +274,3 @@ BF_DEBUG_CCFLAGS = ['-g'] BF_BUILDDIR='../build/darwin' BF_INSTALLDIR='../install/darwin' -BF_DOCDIR='../install/doc' diff --git a/config/irix6-config.py b/config/irix6-config.py index d38665f282a..085d1dd1e62 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -189,7 +189,6 @@ BF_DEBUG_FLAGS = '-g' BF_BUILDDIR = '../build/irix6' BF_INSTALLDIR='../install/irix6' -BF_DOCDIR='../install/doc' #Link against pthread LDIRS = [] diff --git a/config/linux2-config.py b/config/linux2-config.py index 757b8210e49..026d0a200a5 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -189,8 +189,6 @@ BF_DEBUG_CCFLAGS = ['-g'] BF_BUILDDIR = '../build/linux2' BF_INSTALLDIR='../install/linux2' -BF_DOCDIR='../install/doc' - #Link against pthread PLATFORM_LINKFLAGS = ['-pthread'] diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index a7ce2dc2908..a5c83dc3503 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -139,4 +139,3 @@ BF_PROFILE_LINKFLAGS = ['-pg'] BF_BUILDDIR = '../build/linuxcross' BF_INSTALLDIR='../install/linuxcross' -BF_DOCDIR='../install/doc' diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index 95649321c07..353d30f50b3 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -151,4 +151,3 @@ BF_DEBUG_CCFLAGS = ['-g'] BF_BUILDDIR='../build/openbsd3' BF_INSTALLDIR='../install/openbsd3' -BF_DOCDIR='../install/doc' diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 8af30e4f4f3..8e4c53b5bc4 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -165,7 +165,6 @@ BF_DEBUG_CCFLAGS = [] BF_BUILDDIR = '../build/sunos5' BF_INSTALLDIR='../install/sunos5' -BF_DOCDIR='../install/doc' PLATFORM_LINKFLAGS = [] diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index e3834c41a81..6b10b410715 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -6,7 +6,8 @@ BF_PYTHON_VERSION = '3.1' WITH_BF_STATICPYTHON = False BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' -BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}' +BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw' +BF_PYTHON_DLL = 'python31' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a' @@ -152,4 +153,3 @@ BF_PROFILE = False BF_BUILDDIR = '..\\build\\win32-mingw' BF_INSTALLDIR='..\\install\\win32-mingw' -BF_DOCDIR = '..\\install\\doc' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 1e993565e98..291aa023ec8 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -13,6 +13,7 @@ BF_PYTHON_VERSION = '3.1' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python31' +BF_PYTHON_DLL = '${BF_PYTHON_LIB}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = True @@ -173,4 +174,3 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/N BF_BUILDDIR = '..\\build\\win32-vc' BF_INSTALLDIR='..\\install\\win32-vc' -BF_DOCDIR='..\\install\\doc' diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py index f2fc3190ac9..8087d36008a 100644 --- a/config/win64-vc-config.py +++ b/config/win64-vc-config.py @@ -14,6 +14,7 @@ BF_PYTHON_VERSION = '3.1' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python31' +BF_PYTHON_DLL = '${BF_PYTHON_LIB}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = False @@ -223,7 +224,6 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/INCREMENTAL:NO','/NO BF_BUILDDIR = '..\\build\\blender25-win64-vc' BF_INSTALLDIR='..\\install\\blender25-win64-vc' -BF_DOCDIR='..\\install\\blender25-win64-vc\\doc' |