forked from bartvdbraak/blender
- remove CPPFLAG XP_UNIX from CMake, Scons and Irix make, checked our own code and /usr/include, its only used in our netscape plugin.
- CMake on unix default OpenMP to enabled. - Scons on linux default OpenMP to enabled. - copying python is slow, for scons only copy if the directory has not been created.
This commit is contained in:
parent
55b3280355
commit
b895b2e48f
@ -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_SDL "Enable SDL for sound and joystick support" ON)
|
||||||
OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
|
OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
|
||||||
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
|
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_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
|
||||||
OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
|
OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
|
||||||
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
|
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
|
||||||
@ -82,6 +81,13 @@ OPTION(WITH_BUILDINFO "Include extra build details" ON)
|
|||||||
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" 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)
|
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)
|
IF (APPLE)
|
||||||
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
|
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(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
|
||||||
@ -237,7 +243,7 @@ IF(UNIX AND NOT APPLE)
|
|||||||
ENDIF(WITH_OPENMP)
|
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")
|
SET(PLATFORM_LINKFLAGS "-pthread")
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ CXX = 'CC'
|
|||||||
|
|
||||||
CCFLAGS = ['-pipe','-fPIC', '-n32']
|
CCFLAGS = ['-pipe','-fPIC', '-n32']
|
||||||
|
|
||||||
CPPFLAGS = ['-DXP_UNIX']
|
CPPFLAGS = []
|
||||||
CXXFLAGS = ['-pipe','-fPIC', '-n32']
|
CXXFLAGS = ['-pipe','-fPIC', '-n32']
|
||||||
REL_CFLAGS = ['-O2']
|
REL_CFLAGS = ['-O2']
|
||||||
REL_CCFLAGS = ['-O2']
|
REL_CCFLAGS = ['-O2']
|
||||||
|
@ -165,6 +165,8 @@ BF_EXPAT = '/usr'
|
|||||||
BF_EXPAT_LIB = 'expat'
|
BF_EXPAT_LIB = 'expat'
|
||||||
BF_EXPAT_LIBPATH = '/usr/lib'
|
BF_EXPAT_LIBPATH = '/usr/lib'
|
||||||
|
|
||||||
|
WITH_BF_OPENMP = True
|
||||||
|
|
||||||
##
|
##
|
||||||
CC = 'gcc'
|
CC = 'gcc'
|
||||||
CXX = 'g++'
|
CXX = 'g++'
|
||||||
@ -173,7 +175,7 @@ CXX = 'g++'
|
|||||||
|
|
||||||
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
|
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
|
||||||
|
|
||||||
CPPFLAGS = ['-DXP_UNIX']
|
CPPFLAGS = []
|
||||||
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
|
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
|
||||||
REL_CFLAGS = ['-O2']
|
REL_CFLAGS = ['-O2']
|
||||||
REL_CCFLAGS = ['-O2']
|
REL_CCFLAGS = ['-O2']
|
||||||
|
@ -119,7 +119,7 @@ CXX = 'i586-mingw32msvc-g++'
|
|||||||
|
|
||||||
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
|
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' ]
|
CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
|
||||||
REL_CFLAGS = [ '-O2' ]
|
REL_CFLAGS = [ '-O2' ]
|
||||||
REL_CCFLAGS = [ '-O2' ]
|
REL_CCFLAGS = [ '-O2' ]
|
||||||
|
@ -136,7 +136,7 @@ CXX = 'g++'
|
|||||||
|
|
||||||
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
|
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']
|
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
|
||||||
REL_CFLAGS = ['-O2']
|
REL_CFLAGS = ['-O2']
|
||||||
REL_CCFLAGS = ['-O2']
|
REL_CCFLAGS = ['-O2']
|
||||||
|
@ -136,7 +136,7 @@ CXX = 'g++'
|
|||||||
|
|
||||||
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
|
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' ]
|
CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
|
||||||
REL_CFLAGS = [ '-O2' ]
|
REL_CFLAGS = [ '-O2' ]
|
||||||
REL_CCFLAGS = [ '-O2' ]
|
REL_CCFLAGS = [ '-O2' ]
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* $Id$
|
* $Id$
|
||||||
*
|
*
|
||||||
|
@ -117,7 +117,6 @@ ifeq ($(OS),irix)
|
|||||||
CCFLAGS += -fPIC -fpermissive -funsigned-char -fno-strict-aliasing -mabi=n32 -mips4
|
CCFLAGS += -fPIC -fpermissive -funsigned-char -fno-strict-aliasing -mabi=n32 -mips4
|
||||||
REL_CFLAGS += -O2
|
REL_CFLAGS += -O2
|
||||||
REL_CCFLAGS += -O2
|
REL_CCFLAGS += -O2
|
||||||
CPPFLAGS += -DXP_UNIX
|
|
||||||
DBG_CFLAGS += -g3 -gdwarf-2 -ggdb
|
DBG_CFLAGS += -g3 -gdwarf-2 -ggdb
|
||||||
DBG_CCFLAGS += -g3 -gdwarf-2 -ggdb
|
DBG_CCFLAGS += -g3 -gdwarf-2 -ggdb
|
||||||
else
|
else
|
||||||
|
@ -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_src = env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] )
|
||||||
py_target = env.subst( dir + '/python/lib/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.
|
# Copied from source/creator/CMakeLists.txt, keep in sync.
|
||||||
print 'Install python from:'
|
print 'Install python from:'
|
||||||
print '\t"%s" into...' % py_src
|
print '\t"%s" into...' % py_src
|
||||||
|
Loading…
Reference in New Issue
Block a user