From ddc60e957b275731542850efac9d2e00fe67e3e8 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 15 Apr 2015 09:56:00 -0400 Subject: [PATCH] Fix makefile for windows build --- .gitignore | 3 +++ Makefile | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2b8f820..46939d4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ build/* **/*.o Tyro.app/* nbproject/private/* +config/*_json.h +config/json2c +**/*.exe \ No newline at end of file diff --git a/Makefile b/Makefile index a3dccdd..fc49357 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ PROGRAM_OBJECTS = $(patsubst %.cpp,%.o, $(PROGRAM_SRC)) BASE_FLAGS = -DSCI_LEXER -LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc adv) -lssh2 +LDLIBS = $(TARGET) $(shell wx-config --libs base core aui stc adv) -L/lib -lssh2 WX_CXXFLAGS = $(shell wx-config --cxxflags) $(BASE_FLAGS) DEV_CXXFLAGS = -g -Wall -Wextra CXXFLAGS = -Os @@ -65,8 +65,8 @@ tests: $(TESTS) sh ./tests/runtests.sh clean: - rm config/json2c - rm config/*_json.h + rm -f config/json2c + rm -f config/*_json.h rm -f *.o rm -rf Tyro.app rm -rf build $(OBJECTS) $(PROGRAM) $(TARGET) $(TESTS)