diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-19 14:49:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-19 14:49:42 +0300 |
| commit | b895b2e48f3910c2ff4b971ce57fc4fe48e2c24a (patch) | |
| tree | 91dc494bd60613888839ad7194456ac00dbb9cc7 /config | |
| parent | 55b328035505d6c94e64e2140f0eebbbd3da6615 (diff) | |
- 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.
Diffstat (limited to 'config')
| -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 |
5 files changed, 7 insertions, 5 deletions
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' ] |