uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge branch 'fix-macos' of yous/uGFX into master

Browse source
This commit is contained in:
inmarket 2017-08-26 00:59:00 +02:00 • committed by Gogs
commit 38f487edcb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boards/base/OSX/example/Makefile
View file

@ -26,7 +26,7 @@
ARCH = ARCH =
SRCFLAGS = -ggdb -O0 SRCFLAGS = -ggdb -O0
CFLAGS = `sdl2-config --libs --cflags` CFLAGS = $(sdl2-config --cflags)
CXXFLAGS = CXXFLAGS =
ASFLAGS = ASFLAGS =
LDFLAGS = LDFLAGS =
@ -34,7 +34,7 @@ LDFLAGS =
SRC = SRC =
OBJS = OBJS =
DEFS = DEFS =
LIBS = LIBS = $(sdl2-config --libs)
INCPATH = INCPATH =
LIBPATH = LIBPATH =

6
tools/gmake_scripts/os_osx.mk
View file

@ -9,10 +9,10 @@
# Requirements: # Requirements:
# #
# OSX_SDK The location of the SDK eg. OSX_SDK = /Developer/SDKs/MacOSX10.7.sdk # 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.3 # OSX_ARCH The architecture flags eg. OSX_ARCH = -mmacosx-version-min=10.12
# #
SRCFLAGS += -isysroot $(OSX_SDK) $(OSX_ARCH) SRCFLAGS += -isysroot $(OSX_SDK) $(OSX_ARCH)
LDFLAGS += -pthread -Wl,-syslibroot,$(OSX_SDK) $(OSX_ARCH) LDFLAGS += -pthread -Wl,-syslibroot,$(OSX_SDK) $(OSX_ARCH)
OPT_CPU = x86 OPT_CPU = x64