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

Fix compiling issue on linux

Browse Source
This commit is contained in:
Tim Warren 2015-05-08 09:53:48 -04:00
parent b5b914b40a
commit 649a22653b
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -1,16 +1,12 @@
SOURCES = $(wildcard include/**/*.cpp include/*.cpp src/base/**/*.cpp) SOURCES = $(wildcard include/**/*.cpp include/*.cpp src/base/**/*.cpp)
OBJECTS = $(patsubst %.cpp,%.o, $(SOURCES)) OBJECTS = $(patsubst %.cpp,%.o, $(SOURCES))
BASE_LIB = build/Tyro.a BASE_LIB = build/base.a
JSON_FILES = $(patsubst config/%.json,%.json, $(wildcard config/*.json)) JSON_FILES = $(patsubst config/%.json,%.json, $(wildcard config/*.json))
PROGRAM_SRC = $(wildcard src/*.cpp) PROGRAM_SRC = $(wildcard src/widgets/*.cpp src/settings/*.cpp src/*.cpp)
PROGRAM = build/Tyro PROGRAM = build/Tyro
WIDGET_SRC = $(wildcard src/widgets/*.cpp src/settings/*.cpp)
WIDGET_OBJ = $(patsubst %.cpp,%.o, $(WIDGET_SRC))
WIDGET_LIB = build/widget.a
WX_RES = $(shell wx-config --rescomp) WX_RES = $(shell wx-config --rescomp)
WX_CXXFLAGS = $(shell wx-config --cxxflags) WX_CXXFLAGS = $(shell wx-config --cxxflags)
@ -72,16 +68,10 @@ build:
$(BASE_LIB): build $(OBJECTS) $(BASE_LIB): build $(OBJECTS)
ar rcs $@ $(OBJECTS) ar rcs $@ $(OBJECTS)
ranlib $@ ranlib $@
$(WIDGET_OBJ): CXXFLAGS += $(WX_CXXFLAGS)
$(WIDGET_LIB): $(WIDGET_OBJ)
ar rcs $@ $(WIDGET_OBJ)
ranlib $@
$(PROGRAM): CXXFLAGS += $(WX_CXXFLAGS) $(PROGRAM): CXXFLAGS += $(WX_CXXFLAGS)
$(PROGRAM): $(WIDGET_LIB) $(PROGRAM):
$(CXX) $(CXXFLAGS) $(PROGRAM_SRC) $(WIDGET_LIB) $(BASE_LIB) $(WX_LDLIBS) $(LDLIBS) -o $(PROGRAM) $(CXX) $(CXXFLAGS) $(PROGRAM_SRC) $(BASE_LIB) $(WX_LDLIBS) $(LDLIBS) -o $(PROGRAM)
lib: $(OBJECTS) $(BASE_LIB) lib: $(OBJECTS) $(BASE_LIB)