OSX/scons: Try to get rid of buildproblems with openjpeg enabled in certain build...
authorJens Verwiebe <info@jensverwiebe.de>
Sun, 6 Jul 2014 12:10:29 +0000 (14:10 +0200)
committerJens Verwiebe <info@jensverwiebe.de>
Sun, 6 Jul 2014 12:10:41 +0000 (14:10 +0200)
SConstruct
extern/libopenjpeg/SConscript

index 134970dfdc32b6ccb2d299843f4f96b9f1ec21ec..29e7561b7e748164a43c7bb440e5e02cd42105a2 100644 (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']
 
index f5c1f4f48bae925c1ef4977619f86e47e5b2dda1..178875ddec30d72fa22586c0a5beca22aade4a13 100644 (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']