From b4a151458e5757c12807435bb902d9202809e019 Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Thu, 16 Apr 2015 13:16:36 -0400 Subject: [PATCH] Platform-specifc makefile tweaks --- Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fc49357..46d113c 100644 --- a/Makefile +++ b/Makefile @@ -12,13 +12,21 @@ PROGRAM_OBJECTS = $(patsubst %.cpp,%.o, $(PROGRAM_SRC)) 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) DEV_CXXFLAGS = -g -Wall -Wextra CXXFLAGS = -Os -TEST_SRC= $(wildcard tests/*.cpp) +TEST_SRC = $(wildcard tests/*.cpp) 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) dev: CXXFLAGS= $(DEV_CXXFLAGS) @@ -47,6 +55,12 @@ $(PROGRAM): run: ./build/Tyro +release: all +ifeq ($(UNAME),Darwin) + make Tyro.app +endif + + Tyro.app: all resources/platform/osx/Info.plist SetFile -t APPL $(TARGET) -mkdir Tyro.app