summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-06-18 21:10:25 +0200
committerAlexander Larsson <alexl@redhat.com>2010-06-18 21:10:25 +0200
commitae4436215cb113a02eac73c6afd368166090967c (patch)
tree8d144ec5908ada3b363dd4b24a6143f45cdd861b /client
parent0f2e0378348f87c8e408a1db59783e1d9c00d68d (diff)
Make generated marshallers build on win32
Diffstat (limited to 'client')
-rw-r--r--client/windows/generate.bat3
-rw-r--r--client/windows/redc.vcproj28
2 files changed, 23 insertions, 8 deletions
diff --git a/client/windows/generate.bat b/client/windows/generate.bat
new file mode 100644
index 00000000..3757bb0c
--- /dev/null
+++ b/client/windows/generate.bat
@@ -0,0 +1,3 @@
+python ..\..\spice_codegen.py -d -c -i common.h -i messages.h ..\..\spice.proto ..\generated_demarshallers.cpp
+python ..\..\spice_codegen.py --generate-marshallers --include messages.h --client ..\..\spice.proto ..\generated_marshallers.cpp
+python ..\..\spice_codegen.py --generate-marshallers --client -H ..\..\spice.proto ..\generated_marshallers.h
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index a178a33a..8f9e5092 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -220,10 +220,6 @@
>
</File>
<File
- RelativePath="..\generated_demarshallers.cpp"
- >
- </File>
- <File
RelativePath="..\display_channel.cpp"
>
</File>
@@ -236,6 +232,10 @@
>
</File>
<File
+ RelativePath="..\generated_demarshallers.cpp"
+ >
+ </File>
+ <File
RelativePath="..\glz_decoder.cpp"
>
</File>
@@ -500,6 +500,14 @@
>
</File>
<File
+ RelativePath="..\generated_marshallers.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\generated_marshallers.h"
+ >
+ </File>
+ <File
RelativePath="..\..\common\win\my_getopt-1.5\getopt.h"
>
</File>
@@ -544,6 +552,10 @@
>
</File>
<File
+ RelativePath="..\marshaller.cpp"
+ >
+ </File>
+ <File
RelativePath="..\menu.h"
>
</File>
@@ -695,9 +707,9 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating demarshaller"
- CommandLine="python $(ProjectDir)\..\..\spice_codegen.py -d -c -i common.h $(ProjectDir)\..\..\spice.proto $(ProjectDir)\..\generated_demarshallers.cpp&#x0D;&#x0A;"
+ CommandLine="generate.bat"
AdditionalDependencies=""
- Outputs="$(ProjectDir)/../generated_demarshallers.cpp"
+ Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.h;$(ProjectDir)/../generated_marshallers.cpp"
/>
</FileConfiguration>
<FileConfiguration
@@ -706,8 +718,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Generating demarshaller"
- CommandLine="python $(ProjectDir)\..\..\spice_codegen.py -d -c -i common.h $(ProjectDir)\..\..\spice.proto $(ProjectDir)\..\generated_demarshallers.cpp"
- Outputs="$(ProjectDir)/../generated_demarshallers.cpp"
+ CommandLine="generate.bat"
+ Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.h;$(ProjectDir)/../generated_marshallers.cpp"
/>
</FileConfiguration>
</File>