forked from bartvdbraak/blender
OSX/scons: remove local MAC_MIN_VERS var and use the always identical MACOSX_DEPLOYMENT_TARGET instead
This commit is contained in:
parent
96aaea414b
commit
3e6c369888
@ -51,7 +51,6 @@ else:
|
|||||||
MACOSX_DEPLOYMENT_TARGET = '10.6'
|
MACOSX_DEPLOYMENT_TARGET = '10.6'
|
||||||
MACOSX_SDK='/Developer/SDKs/MacOSX10.8.sdk'
|
MACOSX_SDK='/Developer/SDKs/MacOSX10.8.sdk'
|
||||||
|
|
||||||
MAC_MIN_VERS = MACOSX_DEPLOYMENT_TARGET
|
|
||||||
# gcc always defaults to the system standard compiler linked by a shim or symlink
|
# gcc always defaults to the system standard compiler linked by a shim or symlink
|
||||||
CC = 'gcc'
|
CC = 'gcc'
|
||||||
CXX = 'g++'
|
CXX = 'g++'
|
||||||
@ -329,8 +328,8 @@ else:
|
|||||||
LLIBS = ['stdc++', 'SystemStubs']
|
LLIBS = ['stdc++', 'SystemStubs']
|
||||||
|
|
||||||
if USE_SDK:
|
if USE_SDK:
|
||||||
SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE]
|
SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MACOSX_DEPLOYMENT_TARGET,'-arch',MACOSX_ARCHITECTURE]
|
||||||
PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
|
PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MACOSX_DEPLOYMENT_TARGET,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
|
||||||
CCFLAGS=SDK_FLAGS+CCFLAGS
|
CCFLAGS=SDK_FLAGS+CCFLAGS
|
||||||
CXXFLAGS=SDK_FLAGS+CXXFLAGS
|
CXXFLAGS=SDK_FLAGS+CXXFLAGS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user