diff options
| author | inmarket <inmarket@ugfx.org> | 2017-08-26 00:59:00 +0200 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2017-08-26 00:59:00 +0200 |
| commit | 38f487edcb461b077fe7170774584cd311061afa (patch) | |
| tree | 5e8f9b5f206f754f1b5ec999ec71801abeda71e2 | |
| parent | 642f04380d1574ef919417d9ca1aa25374ac5b84 (diff) | |
| parent | 1cc6004e9a625fccafff35bf6c9b184ea2a16921 (diff) | |
| download | uGFX-38f487edcb461b077fe7170774584cd311061afa.tar.gz uGFX-38f487edcb461b077fe7170774584cd311061afa.tar.bz2 uGFX-38f487edcb461b077fe7170774584cd311061afa.zip | |
Merge branch 'fix-macos' of yous/uGFX into master
| -rw-r--r-- | boards/base/OSX/example/Makefile | 4 | ||||
| -rw-r--r-- | tools/gmake_scripts/os_osx.mk | 6 |
2 files changed, 5 insertions, 5 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 = 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 |