timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Makefile to use older SDK on OS X for more compatibility, but more setup for OS X

Browse Source
This commit is contained in:
Tim Warren 2015-05-04 16:26:23 -04:00
parent b2dfa0a4e4
commit 79650c6dbd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -31,6 +31,7 @@ endif
# Platform compiler flags # Platform compiler flags
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
CXX = $(shell wx-config --cxx) CXX = $(shell wx-config --cxx)
CXX += -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk
LDLIBS += /usr/local/lib/libssh2.a LDLIBS += /usr/local/lib/libssh2.a
endif endif
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
@ -43,9 +44,12 @@ ifeq ($(OS),Windows_NT)
LDLIBS += -L/lib -lwsock32 -lssh2 LDLIBS += -L/lib -lwsock32 -lssh2
endif endif
CXX += -I include -I. CXX += -Iinclude -I. -I/usr/local/include
all: build json_wrapper $(TYRO_LIB) $(PROGRAM) all: build json_wrapper $(TYRO_LIB) $(PROGRAM)
ifeq ($(OS),Darwin)
all: Tyro.app
endif
dev: CXXFLAGS = $(DEV_CXXFLAGS) dev: CXXFLAGS = $(DEV_CXXFLAGS)
dev: all dev: all
@ -71,7 +75,11 @@ $(PROGRAM):
lib: $(OBJECTS) $(TYRO_LIB) lib: $(OBJECTS) $(TYRO_LIB)
run: run:
ifneq ($(OS),Darwin)
./build/Tyro ./build/Tyro
else
open -a $(PWD)/build/Tyro.app
endif
run-grind: run-grind:
@ -102,9 +110,8 @@ exe: LDLIBS += resource.res
exe: json_wrapper_build json_wrapper $(TYRO_LIB) exe: json_wrapper_build json_wrapper $(TYRO_LIB)
exe: msw_resource $(PROGRAM) exe: msw_resource $(PROGRAM)
# OS X application bundle # OS X application bundle
Tyro.app: CXXFLAGS += -static Tyro.app:
Tyro.app: all
SetFile -t APPL $(TYRO_LIB) SetFile -t APPL $(TYRO_LIB)
-mkdir -p build/Tyro.app -mkdir -p build/Tyro.app
-mkdir -p build/Tyro.app/Contents -mkdir -p build/Tyro.app/Contents