From 4f07f53f9868b70a1bd370b625308bcb00decb95 Mon Sep 17 00:00:00 2001 From: Chayoung You Date: Mon, 26 Jun 2017 13:58:00 +0900 Subject: [PATCH 1/2] Fix default OPT_CPU for macOS --- tools/gmake_scripts/os_osx.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/gmake_scripts/os_osx.mk b/tools/gmake_scripts/os_osx.mk index 9bfc7024..b5f99496 100644 --- a/tools/gmake_scripts/os_osx.mk +++ b/tools/gmake_scripts/os_osx.mk @@ -9,10 +9,10 @@ # Requirements: # -# OSX_SDK The location of the SDK eg. OSX_SDK = /Developer/SDKs/MacOSX10.7.sdk -# OSX_ARCH The architecture flags eg. OSX_ARCH = -mmacosx-version-min=10.3 +# OSX_SDK The location of the SDK eg. OSX_SDK = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk +# OSX_ARCH The architecture flags eg. OSX_ARCH = -mmacosx-version-min=10.12 # SRCFLAGS += -isysroot $(OSX_SDK) $(OSX_ARCH) LDFLAGS += -pthread -Wl,-syslibroot,$(OSX_SDK) $(OSX_ARCH) -OPT_CPU = x86 +OPT_CPU = x64 From 1cc6004e9a625fccafff35bf6c9b184ea2a16921 Mon Sep 17 00:00:00 2001 From: Chayoung You Date: Mon, 26 Jun 2017 14:11:16 +0900 Subject: [PATCH 2/2] Fix CFLAGS and LIBS for sdl2 --- boards/base/OSX/example/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/base/OSX/example/Makefile b/boards/base/OSX/example/Makefile index cce88c13..5cc39d15 100644 --- a/boards/base/OSX/example/Makefile +++ b/boards/base/OSX/example/Makefile @@ -26,7 +26,7 @@ ARCH = SRCFLAGS = -ggdb -O0 -CFLAGS = `sdl2-config --libs --cflags` +CFLAGS = $(sdl2-config --cflags) CXXFLAGS = ASFLAGS = LDFLAGS = @@ -34,7 +34,7 @@ LDFLAGS = SRC = OBJS = DEFS = -LIBS = +LIBS = $(sdl2-config --libs) INCPATH = LIBPATH =