Browse Source

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

inmarket 3 years ago
parent
commit
38f487edcb
2 changed files with 5 additions and 5 deletions
  1. 2 2
      boards/base/OSX/example/Makefile
  2. 3 3
      tools/gmake_scripts/os_osx.mk

+ 2 - 2
boards/base/OSX/example/Makefile

@@ -26,7 +26,7 @@
26 26
 
27 27
 ARCH     =
28 28
 SRCFLAGS = -ggdb -O0
29
-CFLAGS   = `sdl2-config --libs --cflags`
29
+CFLAGS   = $(sdl2-config --cflags)
30 30
 CXXFLAGS =
31 31
 ASFLAGS  =
32 32
 LDFLAGS  =
@@ -34,7 +34,7 @@ LDFLAGS  =
34 34
 SRC      =
35 35
 OBJS     =
36 36
 DEFS     =
37
-LIBS     =
37
+LIBS     = $(sdl2-config --libs)
38 38
 INCPATH  =
39 39
 LIBPATH  =
40 40
 

+ 3 - 3
tools/gmake_scripts/os_osx.mk

@@ -9,10 +9,10 @@
9 9
 
10 10
 # Requirements:
11 11
 #
12
-# OSX_SDK	The location of the SDK eg. OSX_SDK  = /Developer/SDKs/MacOSX10.7.sdk
13
-# OSX_ARCH	The architecture flags eg.  OSX_ARCH = -mmacosx-version-min=10.3
12
+# OSX_SDK	The location of the SDK eg. OSX_SDK  = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
13
+# OSX_ARCH	The architecture flags eg.  OSX_ARCH = -mmacosx-version-min=10.12
14 14
 #
15 15
 
16 16
 SRCFLAGS	+= -isysroot $(OSX_SDK) $(OSX_ARCH)
17 17
 LDFLAGS		+= -pthread -Wl,-syslibroot,$(OSX_SDK) $(OSX_ARCH)
18
-OPT_CPU = x86
18
+OPT_CPU = x64