commit b7ff262173d85cf3c70090330a5559f5b879009a parent 25e7d7cb370897077e0db8854f5a25b364f8d6bf Author: Michael Savage <mikejsavage@gmail.com> Date: Fri Jul 7 23:01:38 +0300 mmacosx-version-min=10.9 Diffstat:
libs/glfw.lua | | | 10 | +++++----- |
scripts/gen_makefile.lua | | | 2 | ++ |
diff --git a/libs/glfw.lua b/libs/glfw.lua @@ -35,11 +35,11 @@ elseif OS == "macos" then obj( "libs/glfw/src/cocoa_joystick", "libs/glfw/src/cocoa_joystick.m" ) obj( "libs/glfw/src/nsgl_context", "libs/glfw/src/nsgl_context.m" ) - obj_replace_cxxflags( "libs/glfw/src/cocoa_init", "-c -O2 -D_GLFW_COCOA" ) - obj_replace_cxxflags( "libs/glfw/src/cocoa_monitor", "-c -O2 -D_GLFW_COCOA -Wno-deprecated-declarations" ) - obj_replace_cxxflags( "libs/glfw/src/cocoa_window", "-c -O2 -D_GLFW_COCOA -Wno-deprecated-declarations" ) - obj_replace_cxxflags( "libs/glfw/src/cocoa_joystick", "-c -O2 -D_GLFW_COCOA" ) - obj_replace_cxxflags( "libs/glfw/src/nsgl_context", "-c -O2 -D_GLFW_COCOA -Wno-deprecated-declarations" ) + obj_replace_cxxflags( "libs/glfw/src/cocoa_init", "-c -O2 -D_GLFW_COCOA -mmacosx-verison-min=10.9" ) + obj_replace_cxxflags( "libs/glfw/src/cocoa_monitor", "-c -O2 -D_GLFW_COCOA -Wno-deprecated-declarations -mmacosx-verison-min=10.9" ) + obj_replace_cxxflags( "libs/glfw/src/cocoa_window", "-c -O2 -D_GLFW_COCOA -Wno-deprecated-declarations -mmacosx-verison-min=10.9" ) + obj_replace_cxxflags( "libs/glfw/src/cocoa_joystick", "-c -O2 -D_GLFW_COCOA -mmacosx-verison-min=10.9" ) + obj_replace_cxxflags( "libs/glfw/src/nsgl_context", "-c -O2 -D_GLFW_COCOA -Wno-deprecated-declarations -mmacosx-verison-min=10.9" ) else error( "don't know how to build GLFW on this platform" ) end diff --git a/scripts/gen_makefile.lua b/scripts/gen_makefile.lua @@ -65,6 +65,8 @@ local configs = { configs[ "macos" ] = copy( configs[ "linux" ] ) configs[ "macos" ].cxx = "clang++" +-- TODO: this is not quite right because it can get nuked by gcc_obj_replace_cxxflags +configs[ "macos" ].cxxflags = configs[ "macos" ].cxxflags .. " -mmacosx-version-min=10.9" configs[ "macos-64" ] = copy( configs[ "linux-64" ] ) configs[ "macos-debug" ] = copy( configs[ "linux-debug" ] )