diff options
author | Joel Bodenmann <joel@embedded.pro> | 2016-05-06 13:43:43 +0200 |
---|---|---|
committer | Joel Bodenmann <joel@embedded.pro> | 2016-05-06 13:43:43 +0200 |
commit | 6c90597dc9e8187b1ec373876bf794cab6489c91 (patch) | |
tree | 2e7daa9cda44ffab29e28401fed5374076222ae4 | |
parent | 87ac62e9a261b9981e86f7c9a62c49aca73a5883 (diff) | |
download | uGFX-6c90597dc9e8187b1ec373876bf794cab6489c91.tar.gz uGFX-6c90597dc9e8187b1ec373876bf794cab6489c91.tar.bz2 uGFX-6c90597dc9e8187b1ec373876bf794cab6489c91.zip |
Updating makefiles for MacOS X
-rw-r--r-- | boards/base/OSX/board.mk | 2 | ||||
-rw-r--r-- | boards/base/OSX/example/Makefile | 12 | ||||
-rw-r--r-- | boards/base/OSX/example/readme.txt | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/boards/base/OSX/board.mk b/boards/base/OSX/board.mk index 0d7da3f8..9381890d 100644 --- a/boards/base/OSX/board.mk +++ b/boards/base/OSX/board.mk @@ -1,7 +1,7 @@ GFXINC += $(GFXLIB)/boards/base/OSX GFXSRC += GFXDEFS += -DGFX_USE_OS_OSX=TRUE -GFXLIBS += rt +GFXLIBS += include $(GFXLIB)/drivers/multiple/X/driver.mk diff --git a/boards/base/OSX/example/Makefile b/boards/base/OSX/example/Makefile index 4226f613..d4ea932e 100644 --- a/boards/base/OSX/example/Makefile +++ b/boards/base/OSX/example/Makefile @@ -7,18 +7,18 @@ # General settings # See $(GFXLIB)/tools/gmake_scripts/readme.txt for the list of variables OPT_OS = osx - OPT_LINK_OPTIMIZE = yes + OPT_LINK_OPTIMIZE = no # uGFX settings # See $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk for the list of variables - GFXLIB = ../uGFX + GFXLIB = ../../path/to/ugfx GFXBOARD = OSX GFXDEMO = modules/gdisp/basics # OSX settings # See $(GFXLIB)/tools/gmake_scripts/os_osx.mk for the list of variables - OSX_SDK = /Developer/SDKs/MacOSX10.7.sdk - OSX_ARCH = -mmacosx-version-min=10.3 + OSX_SDK = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk + OSX_ARCH = -mmacosx-version-min=10.11 ############################################################################################## # Set these for your project @@ -35,8 +35,8 @@ SRC = OBJS = DEFS = LIBS = -INCPATH = -LIBPATH = +INCPATH = /opt/X11/include +LIBPATH = /opt/X11/lib ############################################################################################## # These should be at the end diff --git a/boards/base/OSX/example/readme.txt b/boards/base/OSX/example/readme.txt index aff58bb1..66491238 100644 --- a/boards/base/OSX/example/readme.txt +++ b/boards/base/OSX/example/readme.txt @@ -1,5 +1,2 @@ Copy these files into your own project directory and alter them to suite. -Notes: - -1/ Look at the MYFILES definition and the MYCSRC definition. |