From 31ba94d4efa6e3f64ffacf1711438e88d8b3035d Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 8 Nov 2011 08:58:17 +0100
Subject: add ftgl to c/ldflags

---
 .gitignore      | 2 +-
 Makefile        | 4 ++--
 test/.gitignore | 1 +
 test/Makefile   | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e38a2894..410abbb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,5 @@ aclocal.m4
 autom4te.cache/
 coverage/
 usdx
-test/
 debug.log
+debug.?.log
diff --git a/Makefile b/Makefile
index cff3d740..94a4c75f 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
-- 
cgit v1.2.3