[Spice-commits] 2 commits - Makefile.am vdservice/vdservice.cpp

[Marc-André Lureau]

 Makefile.am             |    2 +-
 vdservice/vdservice.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7d75ac51cc8ffa85e47fee57265b0277870712ee
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu May 24 19:00:21 2012 +0200

    build-sys: move back vdservice to console
    
    So we can use it from command line properly..
    Sigh.. I wish they wouldn't make this useless distinction..

diff --git a/Makefile.am b/Makefile.am
index 5afce17..5f0c9dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES =				\
 	$(NULL)
 
 AM_CPPFLAGS = -DUNICODE -D_UNICODE
-AM_LDFLAGS = -Wl,--subsystem,windows
 # -lversion is needed for the GetFileVersion* API which is used by vdlog.cpp
 LIBS = -lversion
 
@@ -15,6 +14,7 @@ bin_PROGRAMS = vdagent vdservice
 
 vdagent_LDADD = $(CXIMAGE_LIBS) vdagent_rc.$(OBJEXT)
 vdagent_CXXFLAGS = $(CXIMAGE_CFLAGS)
+vdagent_LDFLAGS = -Wl,--subsystem,windows
 vdagent_SOURCES =			\
 	common/vdcommon.h		\
 	common/vdlog.cpp		\
commit cee350027f0583a5b687266479a9b89e5f74d669
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Thu May 24 15:03:17 2012 +0200

    mingw: fix broken build
    
    Add missing declaration left-over.

diff --git a/vdservice/vdservice.cpp b/vdservice/vdservice.cpp
index 3c35609..717215f 100644
--- a/vdservice/vdservice.cpp
+++ b/vdservice/vdservice.cpp
@@ -1223,7 +1223,7 @@ int _tmain(int argc, TCHAR* argv[]);
 int main(void)
 {
    int argc;
-   argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+   TCHAR** argv = CommandLineToArgvW(GetCommandLineW(), &argc);
    return _tmain(argc, argv);
 }
 #else