interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some OS X 10.7 build errors.

This commit is contained in:
Pietro Gagliardi 2016-05-14 23:44:07 -04:00
parent 2c692eda36
commit 717486b7a2
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/GNUmakefile.example
View File

@ -33,7 +33,7 @@ ifeq ($(TOOLCHAIN),gcc)
LDFLAGS += -L$(OUTDIR) -lui LDFLAGS += -L$(OUTDIR) -lui
# see build/GNUmakefile.test # see build/GNUmakefile.test
ifeq ($(OS),darwin) ifeq ($(OS),darwin)
LDFLAGS += -Wl,-rpath,@executable_path LDFLAGS += -Wl,-rpath,@executable_path/
else else
LDFLAGS += -Wl,-rpath,'$$ORIGIN' LDFLAGS += -Wl,-rpath,'$$ORIGIN'
endif endif

3
build/GNUmakefile.test
View File

@ -18,8 +18,9 @@ ifeq ($(TOOLCHAIN),gcc)
# tell the dynamic loader to search in the executable path for shared objects # tell the dynamic loader to search in the executable path for shared objects
# note: OS X's linker complains if we say -rpath= instead of -rpath, # note: OS X's linker complains if we say -rpath= instead of -rpath,
# also note that OS X doesn't use $ORIGIN - see http://jorgen.tjer.no/post/2014/05/20/dt-rpath-ld-and-at-rpath-dyld/ # also note that OS X doesn't use $ORIGIN - see http://jorgen.tjer.no/post/2014/05/20/dt-rpath-ld-and-at-rpath-dyld/
# the extra slash is needed on OS X 10.7
ifeq ($(OS),darwin) ifeq ($(OS),darwin)
LDFLAGS += -Wl,-rpath,@executable_path LDFLAGS += -Wl,-rpath,@executable_path/
else else
LDFLAGS += -Wl,-rpath,'$$ORIGIN' LDFLAGS += -Wl,-rpath,'$$ORIGIN'
endif endif

3
darwin/uipriv_darwin.h
View File

@ -10,6 +10,9 @@
#error Sorry, libui cannot be compiled with ARC. #error Sorry, libui cannot be compiled with ARC.
#endif #endif
// 10.7 fixups
#define NSEventModifierFlags NSUInteger
#define toNSString(str) [NSString stringWithUTF8String:(str)] #define toNSString(str) [NSString stringWithUTF8String:(str)]
#define fromNSString(str) [(str) UTF8String] #define fromNSString(str) [(str) UTF8String]