Fixed some OS X 10.7 build errors.
This commit is contained in:
parent
2c692eda36
commit
717486b7a2
|
@ -33,7 +33,7 @@ ifeq ($(TOOLCHAIN),gcc)
|
|||
LDFLAGS += -L$(OUTDIR) -lui
|
||||
# see build/GNUmakefile.test
|
||||
ifeq ($(OS),darwin)
|
||||
LDFLAGS += -Wl,-rpath,@executable_path
|
||||
LDFLAGS += -Wl,-rpath,@executable_path/
|
||||
else
|
||||
LDFLAGS += -Wl,-rpath,'$$ORIGIN'
|
||||
endif
|
||||
|
|
|
@ -18,8 +18,9 @@ ifeq ($(TOOLCHAIN),gcc)
|
|||
# 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,
|
||||
# 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)
|
||||
LDFLAGS += -Wl,-rpath,@executable_path
|
||||
LDFLAGS += -Wl,-rpath,@executable_path/
|
||||
else
|
||||
LDFLAGS += -Wl,-rpath,'$$ORIGIN'
|
||||
endif
|
||||
|
|
|
@ -10,6 +10,9 @@
|
|||
#error Sorry, libui cannot be compiled with ARC.
|
||||
#endif
|
||||
|
||||
// 10.7 fixups
|
||||
#define NSEventModifierFlags NSUInteger
|
||||
|
||||
#define toNSString(str) [NSString stringWithUTF8String:(str)]
|
||||
#define fromNSString(str) [(str) UTF8String]
|
||||
|
||||
|
|
Loading…
Reference in New Issue