diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-06 16:10:29 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-06 16:10:41 +0400 |
commit | 2440b3e15810401dc06c0e8af82f90f621e7563e (patch) | |
tree | 7e0720f963ab6b907236b5c2dad49afa05eaf844 | |
parent | 5fefc84783555152c0bb924b3f509c7ec8f1a04d (diff) |
OSX/scons: Try to get rid of buildproblems with openjpeg enabled in certain build environments and prepend SDK_FLAGS to CFLAGS always
-rw-r--r-- | SConstruct | 1 | ||||
-rw-r--r-- | extern/libopenjpeg/SConscript | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 134970dfdc3..29e7561b7e7 100644 --- a/SConstruct +++ b/SConstruct @@ -374,6 +374,7 @@ if env['OURPLATFORM']=='darwin': SDK_FLAGS=['-isysroot', env['MACOSX_SDK'],'-mmacosx-version-min='+ env['MACOSX_DEPLOYMENT_TARGET'],'-arch',env['MACOSX_ARCHITECTURE']] # always used env['PLATFORM_LINKFLAGS'] = ['-mmacosx-version-min='+ env['MACOSX_DEPLOYMENT_TARGET'],'-isysroot', env['MACOSX_SDK'],'-arch',env['MACOSX_ARCHITECTURE']]+ARCH_FLAGS+env['PLATFORM_LINKFLAGS'] + env['CFLAGS']=SDK_FLAGS+env['CFLAGS'] env['CCFLAGS']=SDK_FLAGS+env['CCFLAGS'] env['CXXFLAGS']=SDK_FLAGS+env['CXXFLAGS'] diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript index f5c1f4f48ba..178875ddec3 100644 --- a/extern/libopenjpeg/SConscript +++ b/extern/libopenjpeg/SConscript @@ -13,6 +13,8 @@ defs = [] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): flags = [] defs.append('OPJ_STATIC') +elif env['OURPLATFORM'] == 'darwin': + flags = ['-Wall', '-O3', '-ffast-math', '-std=c99'] + env['CCFLAGS'] # to supply SDK_FLAGS here else: flags = ['-Wall', '-O3', '-ffast-math', '-std=c99'] |