diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2020-03-18 20:23:29 +0000 |
|---|---|---|
| committer | Frediano Ziglio <freddy77@gmail.com> | 2020-04-24 10:33:34 +0100 |
| commit | 3cad1e7570255a90aa07a1fea14fd0d112aec4c2 (patch) | |
| tree | 40203a779b909fd2cf6bdf75d6e383b60645f403 | |
| parent | 5ed23e95ecb3a6eae638e1e210045587be4c77f3 (diff) | |
Compile in agent utilities from spice-common
Allows these utilities to be used in the code.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| m--------- | spice-common | 0 |
4 files changed, 10 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index f946a4d..9b61820 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,8 @@ [submodule "spice-protocol"] path = spice-protocol url = git://git.freedesktop.org/git/spice/spice-protocol.git + +[submodule "spice-common"] + path = spice-common + url = git://git.freedesktop.org/git/spice/spice-common.git + ignore = untracked diff --git a/CMakeLists.txt b/CMakeLists.txt index 039079b..2a8b2b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ else(MSVC) set(COMMSUPPW_LIBRARY) endif(MSVC) -include_directories(common ${CMAKE_BINARY_DIR} spice-protocol ${PNG_INCLUDE_DIR}) +include_directories(common ${CMAKE_BINARY_DIR} spice-protocol spice-common ${PNG_INCLUDE_DIR}) add_definitions(-DUNICODE -D_UNICODE -DOLDMSVCRT -DWINVER=0x0601) add_executable(vdagent WIN32 @@ -93,6 +93,7 @@ add_executable(vdagent WIN32 vdagent/file_xfer.cpp vdagent/file_xfer.h vdagent/vdagent.cpp + spice-common/common/agent.c vdagent/as_user.cpp vdagent/as_user.h vdagent/image.cpp diff --git a/Makefile.am b/Makefile.am index 8da212e..6e464c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -DWINVER=0x0601 \ -I$(top_srcdir)/common \ -I$(top_srcdir)/spice-protocol \ + -I$(top_srcdir)/spice-common \ $(NULL) AM_LDFLAGS = -static @@ -26,6 +27,8 @@ vdagent_SOURCES = \ common/vdcommon.h \ common/vdlog.cpp \ common/vdlog.h \ + spice-common/common/agent.c \ + spice-common/common/agent.h \ vdagent/display_configuration.cpp \ vdagent/display_configuration.h \ vdagent/desktop_layout.cpp \ diff --git a/spice-common b/spice-common new file mode 160000 +Subproject 05c0c26839e88e6d0cc5452f49c40e38543c8f9 |