diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2011-11-08 08:58:17 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:49 +0100 |
| commit | 31ba94d4efa6e3f64ffacf1711438e88d8b3035d (patch) | |
| tree | 2df5e63b416117be5ce4a72ee40a4a687e8ed8b5 | |
| parent | a7395016f170d0f27b5757814e0216a94edeba7f (diff) | |
| download | usdx-31ba94d4efa6e3f64ffacf1711438e88d8b3035d.tar.gz usdx-31ba94d4efa6e3f64ffacf1711438e88d8b3035d.tar.xz usdx-31ba94d4efa6e3f64ffacf1711438e88d8b3035d.zip | |
add ftgl to c/ldflags
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | test/.gitignore | 1 | ||||
| -rw-r--r-- | test/Makefile | 4 |
4 files changed, 6 insertions, 5 deletions
@@ -22,5 +22,5 @@ aclocal.m4 autom4te.cache/
coverage/
usdx
-test/
debug.log
+debug.?.log
@@ -7,8 +7,8 @@ sources:=$(wildcard $(TOP)/src/*/*/*.cpp) $(wildcard $(TOP)/src/*/*.cpp) $(wildc deps:=$(sources:.cpp=.d) -CXXFLAGS:=-Wall -Werror -I$(TOP)/src -I$(TOP)/src/base -I$(TOP)/src/menu -I$(TOP)/src/media -I$(TOP)/src/screens -I$(TOP)/src/frames -I$(TOP)/src/utils -g -LDFLAGS:=-lsqlite3 -lSDL -llog4cxx -lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt -lSDL_image -lSDL_gfx -lcppunit -lGL +CXXFLAGS:=-Wall -Werror -I$(TOP)/src -I$(TOP)/src/base -I$(TOP)/src/menu -I$(TOP)/src/media -I$(TOP)/src/screens -I$(TOP)/src/frames -I$(TOP)/src/utils $(shell pkg-config ftgl --cflags) -g +LDFLAGS:=-lsqlite3 -lSDL -llog4cxx -lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt -lSDL_image -lSDL_gfx -lcppunit -lGL $(shell pkg-config ftgl --libs) TARGET:=$(PROJECT) objects:=$(sources:.cpp=.o) diff --git a/test/.gitignore b/test/.gitignore index f23464ea..09352468 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,3 +1,4 @@ usdx-tests usdx-tests-coverage test.xml +.error diff --git a/test/Makefile b/test/Makefile index 3a536a47..b8cd7cbd 100644 --- a/test/Makefile +++ b/test/Makefile @@ -9,8 +9,8 @@ sources:=$(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard $(TOP)/src/*/*/*.cpp) deps:=$(sources:.cpp=.d) -CXXFLAGS:=-Wall -Werror -I$(TOP)/src -I$(TOP)/src/base -I$(TOP)/src/menu -I$(TOP)/src/media -I$(TOP)/src/screens -I$(TOP)/src/frames -I$(TOP)/src/utils -g -LDFLAGS:=-lsqlite3 -lSDL -llog4cxx -lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt -lSDL_image -lcppunit -lSDL_gfx -lGL +CXXFLAGS:=-Wall -Werror -I$(TOP)/src -I$(TOP)/src/base -I$(TOP)/src/menu -I$(TOP)/src/media -I$(TOP)/src/screens -I$(TOP)/src/frames -I$(TOP)/src/utils $(shell pkg-config ftgl --cflags) -g +LDFLAGS:=-lsqlite3 -lSDL -llog4cxx -lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt -lSDL_image -lcppunit -lSDL_gfx -lGL $(shell pkg-config ftgl --libs) TARGET:=$(PROJECT) objects:=$(sources:.cpp=.o) |