summaryrefslogtreecommitdiffstats
path: root/client/application.cpp
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2012-03-21 14:42:35 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2012-03-25 18:59:10 +0200
commit359fc1cb5dbbcf32132c3e8ee6f881a23deff684 (patch)
tree3ae7cc1c8b4d0449d50a13cb9640a6ef75f51f11 /client/application.cpp
parent4df135c858d7dfb1aa0ae5d3cb17d786410d1544 (diff)
downloadspice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.gz
spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.xz
spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.zip
Use the spice-common submodule
This patch will replace the common/ directory with the spice-common project. It is for now a simple project subdirectory shared with spice-gtk, but the goal is to make it a proper library later on. With this change, the spice-server build is broken. The following commits fix the build, and have been seperated to ease the review. v2 - moves all the generated marshallers to spice-common library - don't attempt to fix windows VS build, which should somehow be splitted with spice-common (or built from tarball only to avoid generation tools/libs deps) v3 - uses libspice-common-client - fix a mutex.h inclusion reported by Alon
Diffstat (limited to 'client/application.cpp')
-rw-r--r--client/application.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/application.cpp b/client/application.cpp
index 34ef729f..43fe7fa7 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -23,6 +23,10 @@
#include <io.h>
#endif
+#include "common/quic.h"
+#include "common/mutex.h"
+#include "common/rect.h"
+
#include "application.h"
#include "screen.h"
#include "utils.h"
@@ -38,13 +42,10 @@
#ifdef USE_OPENGL
#include "red_gl_canvas.h"
#endif
-#include "quic.h"
-#include "mutex.h"
#include "cmd_line_parser.h"
#ifdef USE_TUNNEL
#include "tunnel_channel.h"
#endif
-#include "rect.h"
#ifdef USE_GUI
#include "gui/gui.h"
#endif