fixed mac building

This commit is contained in:
oy 2010-12-12 01:08:58 +01:00
parent 49bea07df7
commit 369e22cd4e

View file

@ -134,8 +134,8 @@ function build(settings)
else else
settings.cc.flags:Add("-Wall", "-fno-exceptions") settings.cc.flags:Add("-Wall", "-fno-exceptions")
if platform == "macosx" then if platform == "macosx" then
settings.cc.flags:Add("-mmacosx-version-min=10.5", "-isysroot /Developer/SDKs/MacOSX10.5.sdk", "-arch i386") settings.cc.flags:Add("-mmacosx-version-min=10.5", "-isysroot /Developer/SDKs/MacOSX10.5.sdk")
settings.link.flags:Add("-mmacosx-version-min=10.5", "-isysroot /Developer/SDKs/MacOSX10.5.sdk", "-arch i386") settings.link.flags:Add("-mmacosx-version-min=10.5", "-isysroot /Developer/SDKs/MacOSX10.5.sdk")
elseif config.stackprotector.value == 1 then elseif config.stackprotector.value == 1 then
settings.cc.flags:Add("-fstack-protector", "-fstack-protector-all") settings.cc.flags:Add("-fstack-protector", "-fstack-protector-all")
settings.link.flags:Add("-fstack-protector", "-fstack-protector-all") settings.link.flags:Add("-fstack-protector", "-fstack-protector-all")
@ -298,11 +298,15 @@ if platform == "macosx" and arch == "ia32" then
debug_settings_x86 = debug_settings:Copy() debug_settings_x86 = debug_settings:Copy()
debug_settings_x86.config_name = "debug_x86" debug_settings_x86.config_name = "debug_x86"
debug_settings_x86.config_ext = "_x86_d" debug_settings_x86.config_ext = "_x86_d"
debug_settings_x86.cc.flags:Add("-arch i386")
debug_settings_x86.link.flags:Add("-arch i386")
debug_settings_x86.cc.defines:Add("CONF_DEBUG") debug_settings_x86.cc.defines:Add("CONF_DEBUG")
release_settings_x86 = release_settings:Copy() release_settings_x86 = release_settings:Copy()
release_settings_x86.config_name = "release_x86" release_settings_x86.config_name = "release_x86"
release_settings_x86.config_ext = "_x86" release_settings_x86.config_ext = "_x86"
release_settings_x86.cc.flags:Add("-arch i386")
release_settings_x86.link.flags:Add("-arch i386")
release_settings_x86.cc.defines:Add("CONF_RELEASE") release_settings_x86.cc.defines:Add("CONF_RELEASE")
ppc_d = build(debug_settings_ppc) ppc_d = build(debug_settings_ppc)