summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--client/Makefile.am10
-rw-r--r--client/demarshallers.h1
-rw-r--r--client/marshallers.h1
-rw-r--r--client/windows/generate.bat3
-rw-r--r--client/windows/generate1.bat2
-rw-r--r--client/windows/redc.vcproj49
-rw-r--r--client/x11/Makefile.am2
8 files changed, 56 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 5701e254..0caf9fec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,4 @@ pkgconfig_DATA = spice-server.pc
DISTCLEANFILES = \
spice-server.pc
-EXTRA_DIST = spice.proto spice_codegen.py
+EXTRA_DIST = spice.proto spice1.proto spice_codegen.py
diff --git a/client/Makefile.am b/client/Makefile.am
index 5c0ec8d2..255787eb 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -3,14 +3,20 @@ NULL =
SUBDIRS = . $(red_target)
DIST_SUBDIRS = x11 #windows
-spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp
+spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp generated_demarshallers1.cpp generated_marshallers1.cpp
generated_demarshallers.cpp: $(top_srcdir)/spice.proto
$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h $(top_srcdir)/spice.proto generated_demarshallers.cpp
+generated_demarshallers1.cpp: $(top_srcdir)/spice1.proto
+ $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h --prefix 1 $(top_srcdir)/spice1.proto generated_demarshallers1.cpp
+
generated_marshallers.cpp: $(top_srcdir)/spice.proto
$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client $(top_srcdir)/spice.proto generated_marshallers.cpp
+generated_marshallers1.cpp: $(top_srcdir)/spice1.proto
+ $(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client --prefix 1 $(top_srcdir)/spice1.proto generated_marshallers1.cpp
+
if SUPPORT_GL
GL_SRCS = \
gl_canvas.cpp \
@@ -44,8 +50,10 @@ RED_COMMON_SRCS = \
demarshallers.h \
marshallers.h \
generated_demarshallers.cpp \
+ generated_demarshallers1.cpp \
marshaller.cpp \
generated_marshallers.cpp \
+ generated_marshallers1.cpp \
cursor_channel.cpp \
cursor_channel.h \
cursor.cpp \
diff --git a/client/demarshallers.h b/client/demarshallers.h
index ab0fc58c..fc2f75ae 100644
--- a/client/demarshallers.h
+++ b/client/demarshallers.h
@@ -22,6 +22,7 @@ typedef uint8_t * (*spice_parse_channel_func_t)(uint8_t *message_start, uint8_t
size_t *size_out, message_destructor_t *free_message);
spice_parse_channel_func_t spice_get_server_channel_parser(uint32_t channel, unsigned int *max_message_type);
+spice_parse_channel_func_t spice_get_server_channel_parser1(uint32_t channel, unsigned int *max_message_type);
#endif
diff --git a/client/marshallers.h b/client/marshallers.h
index 7806f295..1e6be115 100644
--- a/client/marshallers.h
+++ b/client/marshallers.h
@@ -56,5 +56,6 @@ typedef struct {
} SpiceMessageMarshallers;
SpiceMessageMarshallers *spice_message_marshallers_get(void);
+SpiceMessageMarshallers *spice_message_marshallers_get1(void);
#endif
diff --git a/client/windows/generate.bat b/client/windows/generate.bat
index 3757bb0c..1bb62b4f 100644
--- a/client/windows/generate.bat
+++ b/client/windows/generate.bat
@@ -1,3 +1,2 @@
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
+python ..\..\spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client ..\..\spice.proto ..\generated_marshallers.cpp
diff --git a/client/windows/generate1.bat b/client/windows/generate1.bat
new file mode 100644
index 00000000..d7203530
--- /dev/null
+++ b/client/windows/generate1.bat
@@ -0,0 +1,2 @@
+python ..\..\spice_codegen.py -d -c -i common.h -i messages.h --prefix 1 ..\..\spice1.proto ..\generated_demarshallers1.cpp
+python ..\..\spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client --prefix 1 ..\..\spice1.proto ..\generated_marshallers1.cpp
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index 37ca23ae..80e875b5 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -236,6 +236,18 @@
>
</File>
<File
+ RelativePath="..\generated_demarshallers1.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\generated_marshallers.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\generated_marshallers1.cpp"
+ >
+ </File>
+ <File
RelativePath="..\glz_decoder.cpp"
>
</File>
@@ -504,14 +516,6 @@
>
</File>
<File
- RelativePath="..\generated_marshallers.cpp"
- >
- </File>
- <File
- RelativePath="..\generated_marshallers.h"
- >
- </File>
- <File
RelativePath="..\..\common\win\my_getopt-1.5\getopt.h"
>
</File>
@@ -717,7 +721,7 @@
Description="Generating demarshaller"
CommandLine="generate.bat"
AdditionalDependencies=""
- Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.h;$(ProjectDir)/../generated_marshallers.cpp"
+ Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.cpp"
/>
</FileConfiguration>
<FileConfiguration
@@ -727,7 +731,32 @@
Name="VCCustomBuildTool"
Description="Generating demarshaller"
CommandLine="generate.bat"
- Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.h;$(ProjectDir)/../generated_marshallers.cpp"
+ Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.cpp"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\spice1.proto"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating old demarshaller"
+ CommandLine="generate1.bat"
+ AdditionalDependencies=""
+ Outputs="$(ProjectDir)/../generated_demarshallers1.cpp;$(ProjectDir)/../generated_marshallers1.cpp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating old demarshaller"
+ CommandLine="generate1.bat"
+ Outputs="$(ProjectDir)/../generated_demarshallers1.cpp;$(ProjectDir)/../generated_marshallers1.cpp"
/>
</FileConfiguration>
</File>
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 394eed07..d92a96df 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -38,9 +38,11 @@ RED_COMMON_SRCS = \
$(CLIENT_DIR)/cache.hpp \
$(CLIENT_DIR)/demarshallers.h \
$(CLIENT_DIR)/generated_demarshallers.cpp \
+ $(CLIENT_DIR)/generated_demarshallers1.cpp \
$(CLIENT_DIR)/marshaller.cpp \
$(CLIENT_DIR)/marshallers.h \
$(CLIENT_DIR)/generated_marshallers.cpp \
+ $(CLIENT_DIR)/generated_marshallers1.cpp \
$(CLIENT_DIR)/sw_canvas.cpp \
$(CLIENT_DIR)/canvas.cpp \
$(CLIENT_DIR)/canvas.h \
generated by cgit (git 2.34.1) at 2024-05-03 11:46:04 +0000