diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/debug | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | src/debug/gdk-event-latency-tracker.h | 2 | ||||
| -rw-r--r-- | src/debug/log-display-config.cpp | 3 | ||||
| -rw-r--r-- | src/debug/logger.cpp | 2 | ||||
| -rw-r--r-- | src/debug/simple-event.h | 2 | ||||
| -rw-r--r-- | src/debug/timestamp.cpp | 3 |
6 files changed, 31 insertions, 19 deletions
diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 26c4e6934..5c0354fce 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -1,12 +1,28 @@ -SET(debug_SRC -demangle.cpp -heap.cpp -log-display-config.cpp -logger.cpp -sysv-heap.cpp -timestamp.cpp -gdk-event-latency-tracker.cpp + +set(debug_SRC + demangle.cpp + heap.cpp + log-display-config.cpp + logger.cpp + sysv-heap.cpp + timestamp.cpp + gdk-event-latency-tracker.cpp + + + # ------ + # Header + demangle.h + event-tracker.h + event.h + gc-heap.h + gdk-event-latency-tracker.h + heap.h + log-display-config.h + logger.h + simple-event.h + sysv-heap.h + timestamp.h ) -ADD_LIBRARY(debug STATIC ${debug_SRC}) -TARGET_LINK_LIBRARIES(debug -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +# add_inkscape_lib(debug_LIB "${debug_SRC}") +add_inkscape_source("${debug_SRC}") diff --git a/src/debug/gdk-event-latency-tracker.h b/src/debug/gdk-event-latency-tracker.h index 12ebb6570..c3624e74f 100644 --- a/src/debug/gdk-event-latency-tracker.h +++ b/src/debug/gdk-event-latency-tracker.h @@ -12,7 +12,7 @@ #ifndef SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H #define SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H -#include <gdk/gdkevents.h> +#include <gdk/gdk.h> #include <glibmm/timer.h> #include <boost/optional.hpp> diff --git a/src/debug/log-display-config.cpp b/src/debug/log-display-config.cpp index d2821cc53..07380b3ad 100644 --- a/src/debug/log-display-config.cpp +++ b/src/debug/log-display-config.cpp @@ -10,8 +10,7 @@ */ #include <iostream> -#include <gdk/gdkdisplay.h> -#include <gdk/gdkscreen.h> +#include <gdk/gdk.h> #include "debug/event-tracker.h" #include "debug/logger.h" #include "debug/simple-event.h" diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp index bc761d67e..485dbc365 100644 --- a/src/debug/logger.cpp +++ b/src/debug/logger.cpp @@ -11,7 +11,7 @@ #include <fstream> #include <vector> -#include <glib/gmessages.h> +#include <glib.h> #include "inkscape-version.h" #include "debug/logger.h" #include "debug/simple-event.h" diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h index d09358224..506ee1b03 100644 --- a/src/debug/simple-event.h +++ b/src/debug/simple-event.h @@ -15,8 +15,6 @@ #include <stdarg.h> #include <vector> #include <glib.h> // g_assert() -#include <glib/gstrfuncs.h> -#include <glib/gmessages.h> #include "gc-alloc.h" #include "debug/event.h" diff --git a/src/debug/timestamp.cpp b/src/debug/timestamp.cpp index 4c014e965..e100134c8 100644 --- a/src/debug/timestamp.cpp +++ b/src/debug/timestamp.cpp @@ -10,8 +10,7 @@ */ -#include <glib/gtypes.h> -#include <glib/gmain.h> +#include <glib.h> #include <glibmm/ustring.h> #include "debug/simple-event.h" |