tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

OSX/scons: Try to get rid of buildproblems with openjpeg enabled in certain build environments and prepend SDK_FLAGS to CFLAGS always

This commit is contained in:
Jens Verwiebe 2014-07-06 14:10:29 +02:00
parent 5fefc84783
commit 2440b3e158
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@ -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']

2
extern/libopenjpeg/SConscript vendored
View File

@ -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']