diff options
-rw-r--r-- | CMakeLists.txt | 16 | ||||
-rw-r--r-- | config/irix6-config.py | 2 | ||||
-rw-r--r-- | config/linux2-config.py | 4 | ||||
-rw-r--r-- | config/linuxcross-config.py | 2 | ||||
-rw-r--r-- | config/sunos5-config.py | 2 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 1 | ||||
-rw-r--r-- | source/nan_compile.mk | 3 | ||||
-rw-r--r-- | tools/Blender.py | 8 |
9 files changed, 28 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dd331469a0..c7e08d7b1ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,6 @@ OPTION(WITH_PYTHON "Enable Embedded Python API" ON) OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON) OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF) OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) -OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF) OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF) OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF) OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF) @@ -82,10 +81,17 @@ OPTION(WITH_BUILDINFO "Include extra build details" ON) OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON) OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF) +# Unix defaults to OpenMP On +IF (UNIX) + OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON) +ELSE(UNIX) + OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF) +ENDIF(UNIX) + IF (APPLE) -OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON) -OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF) -OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF) + OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON) + OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF) + OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF) ENDIF (APPLE) IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) @@ -237,7 +243,7 @@ IF(UNIX AND NOT APPLE) ENDIF(WITH_OPENMP) - SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts") + SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts") SET(PLATFORM_LINKFLAGS "-pthread") diff --git a/config/irix6-config.py b/config/irix6-config.py index 085d1dd1e62..ab2ef02c977 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -161,7 +161,7 @@ CXX = 'CC' CCFLAGS = ['-pipe','-fPIC', '-n32'] -CPPFLAGS = ['-DXP_UNIX'] +CPPFLAGS = [] CXXFLAGS = ['-pipe','-fPIC', '-n32'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] diff --git a/config/linux2-config.py b/config/linux2-config.py index dffc861fca8..3eccb913932 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -165,6 +165,8 @@ BF_EXPAT = '/usr' BF_EXPAT_LIB = 'expat' BF_EXPAT_LIBPATH = '/usr/lib' +WITH_BF_OPENMP = True + ## CC = 'gcc' CXX = 'g++' @@ -173,7 +175,7 @@ CXX = 'g++' CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] -CPPFLAGS = ['-DXP_UNIX'] +CPPFLAGS = [] CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index a5c83dc3503..3cfa1158700 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -119,7 +119,7 @@ CXX = 'i586-mingw32msvc-g++' CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] -CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ] +CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS'] CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ] REL_CFLAGS = [ '-O2' ] REL_CCFLAGS = [ '-O2' ] diff --git a/config/sunos5-config.py b/config/sunos5-config.py index 8e4c53b5bc4..88dce927db4 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -136,7 +136,7 @@ CXX = 'g++' CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] -CPPFLAGS = ['-DXP_UNIX', '-DSUN_OGL_NO_VERTEX_MACROS'] +CPPFLAGS = ['-DSUN_OGL_NO_VERTEX_MACROS'] CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index b519aa95ca7..709261ec1ca 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -136,7 +136,7 @@ CXX = 'g++' CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ] -CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ] +CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS'] CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ] REL_CFLAGS = [ '-O2' ] REL_CCFLAGS = [ '-O2' ] diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index d12de5f2e46..1ab50cdc864 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1,3 +1,4 @@ + /** * $Id$ * diff --git a/source/nan_compile.mk b/source/nan_compile.mk index 6a1263e286c..258d06c07b9 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -116,8 +116,7 @@ ifeq ($(OS),irix) CFLAGS += -fPIC -funsigned-char -fno-strict-aliasing -mabi=n32 -mips4 CCFLAGS += -fPIC -fpermissive -funsigned-char -fno-strict-aliasing -mabi=n32 -mips4 REL_CFLAGS += -O2 - REL_CCFLAGS += -O2 - CPPFLAGS += -DXP_UNIX + REL_CCFLAGS += -O2 DBG_CFLAGS += -g3 -gdwarf-2 -ggdb DBG_CCFLAGS += -g3 -gdwarf-2 -ggdb else diff --git a/tools/Blender.py b/tools/Blender.py index 94ad485e176..4dad70bbef5 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -545,6 +545,14 @@ def UnixPyBundle(target=None, source=None, env=None): py_src = env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] ) py_target = env.subst( dir + '/python/lib/python'+env['BF_PYTHON_VERSION'] ) + # This is a bit weak, but dont install if its been installed before, makes rebuilds quite slow. + if os.path.exists(py_target): + print 'Using existing python from:' + print '\t"%s"' % py_target + print '\t(skipping copy)\n' + return + + # Copied from source/creator/CMakeLists.txt, keep in sync. print 'Install python from:' print '\t"%s" into...' % py_src |