Platform-specifc makefile tweaks

This commit is contained in:
Tim Warren 2015-04-16 13:16:36 -04:00
parent af4934b16b
commit b4a151458e

View File

@ -12,13 +12,21 @@ PROGRAM_OBJECTS = $(patsubst %.cpp,%.o, $(PROGRAM_SRC))
BASE_FLAGS = -DSCI_LEXER BASE_FLAGS = -DSCI_LEXER
LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc adv) -L/lib -lssh2 LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc adv) -lssh2
WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS) WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS)
DEV_CXXFLAGS = -g -Wall -Wextra DEV_CXXFLAGS = -g -Wall -Wextra
CXXFLAGS = -Os CXXFLAGS = -Os
TEST_SRC = $(wildcard tests/*.cpp) TEST_SRC = $(wildcard tests/*.cpp)
TESTS = $(patsubst %.cpp,%,$(TEST_SRC)) TESTS = $(patsubst %.cpp,%,$(TEST_SRC))
UNAME = $(shell uname -s)
# Add the /lib search directory for MSyS on Windows
ifdef OS
ifeq($(OS),Windows_NT)
LDLIBS += -L/lib
endif
all: build json_wrapper $(TARGET) $(PROGRAM) all: build json_wrapper $(TARGET) $(PROGRAM)
dev: CXXFLAGS= $(DEV_CXXFLAGS) dev: CXXFLAGS= $(DEV_CXXFLAGS)
@ -47,6 +55,12 @@ $(PROGRAM):
run: run:
./build/Tyro ./build/Tyro
release: all
ifeq ($(UNAME),Darwin)
make Tyro.app
endif
Tyro.app: all resources/platform/osx/Info.plist Tyro.app: all resources/platform/osx/Info.plist
SetFile -t APPL $(TARGET) SetFile -t APPL $(TARGET)
-mkdir Tyro.app -mkdir Tyro.app