[niepce] Misc build fixes: -Remove the libgdl Makefile as libgdl has been removed. -Add a few missing INCLUDE



commit 395112005d06f72fc87447870b426080824f88e8
Author: Hub Figuiere <hub figuiere net>
Date:   Sat Oct 29 00:33:08 2011 -0700

    Misc build fixes:
    -Remove the libgdl Makefile as libgdl has been removed.
    -Add a few missing INCLUDE path
    -Fix the format to output the thread ID
    -Remove the -pedantic flag

 configure.ac           |    3 +--
 src/fwk/Makefile.am    |    6 ++++--
 src/fwk/base/debug.cpp |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aa4c50e..74330a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AC_ARG_ENABLE(debug,[  --enable-debug    Turn on debugging],[
 AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
 
 
-CPPFLAGS="$CPPFLAGS $DEBUG_CFLAGS -pedantic -Wall -Wcast-align -Wcast-qual -Wpointer-arith -Wreturn-type"
+CPPFLAGS="$CPPFLAGS $DEBUG_CFLAGS -Wall -Wcast-align -Wcast-qual -Wpointer-arith -Wreturn-type"
 CFLAGS="$CFLAGS $DEBUG_CFLAGS $OPTIMIZE_CFLAGS"
 CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS $OPTIMIZE_CFLAGS"
 dnl CFLAGS=""
@@ -150,7 +150,6 @@ data/icons/Makefile
 data/themes/Makefile
 src/Makefile
 src/ext/Makefile
-src/ext/libgdl/Makefile
 src/ext/libview/Makefile
 src/niepce/ui/Makefile
 src/niepce/ui/dialogs/Makefile
diff --git a/src/fwk/Makefile.am b/src/fwk/Makefile.am
index 0cdeacb..615b380 100644
--- a/src/fwk/Makefile.am
+++ b/src/fwk/Makefile.am
@@ -1,7 +1,9 @@
 SUBDIRS = utils toolkit
 
 
-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/src \
+	@BOOST_CPPFLAGS@ \
+	$(NULL)
 
 noinst_LIBRARIES = libfwk.a
 
@@ -27,4 +29,4 @@ libfwk_a_SOURCES = base/color.hpp base/color.cpp \
 	base/geometry.hpp base/geometry.cpp \
 	base/singleton.hpp \
 	base/map.hpp \
-	$(NULL)
\ No newline at end of file
+	$(NULL)
diff --git a/src/fwk/base/debug.cpp b/src/fwk/base/debug.cpp
index 817eb02..5a6fca3 100644
--- a/src/fwk/base/debug.cpp
+++ b/src/fwk/base/debug.cpp
@@ -107,7 +107,7 @@ namespace fwk {
 							const char* func,	va_list marker)
 	{
 		char buf[128];
-		snprintf(buf, 128, "(%ld) ", (long)pthread_self());
+		snprintf(buf, 128, "(%p) ", pthread_self());
 		fwrite(buf, 1, strlen(buf), stderr);
 		fwrite(prefix, 1, strlen(prefix), stderr);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]