Support for R21.016

rsodre · Sep 14, 2019 · dd047a7 · dd047a7
1 parent bd318b8
commit dd047a7
Show file tree

Hide file tree

Showing 98 changed files with 2,417 additions and 5 deletions.
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/roger.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/roger.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/.../generated/hxx/interface_registration.cpp → .../generated/hxx/interface_registration.cpp b/.../generated/hxx/interface_registration.cpp → .../generated/hxx/interface_registration.cpp
diff --git a/...generated/hxx/reflection_registration.cpp → ...generated/hxx/reflection_registration.cpp b/...generated/hxx/reflection_registration.cpp → ...generated/hxx/reflection_registration.cpp
diff --git a/...d/hxx/reflection_virtual_registration.cpp → ...d/hxx/reflection_virtual_registration.cpp b/...d/hxx/reflection_virtual_registration.cpp → ...d/hxx/reflection_virtual_registration.cpp
diff --git a/R20.055/SyphonR20/generated/hxx/register.cpp → R20/SyphonR20/generated/hxx/register.cpp b/R20.055/SyphonR20/generated/hxx/register.cpp → R20/SyphonR20/generated/hxx/register.cpp
diff --git a/R20.055/SyphonR20/generated/hxx/register.hxx → R20/SyphonR20/generated/hxx/register.hxx b/R20.055/SyphonR20/generated/hxx/register.hxx → R20/SyphonR20/generated/hxx/register.hxx
diff --git a/...gistration_com_studioavante_SyphonR20.hxx → ...gistration_com_studioavante_SyphonR20.hxx b/...gistration_com_studioavante_SyphonR20.hxx → ...gistration_com_studioavante_SyphonR20.hxx
diff --git a/...on.framework/Versions/A/Headers/Syphon.ph → ...on.framework/Versions/A/Headers/Syphon.ph b/...on.framework/Versions/A/Headers/Syphon.ph → ...on.framework/Versions/A/Headers/Syphon.ph
diff --git a/...mework/Versions/A/Headers/SyphonClient.ph → ...mework/Versions/A/Headers/SyphonClient.ph b/...mework/Versions/A/Headers/SyphonClient.ph → ...mework/Versions/A/Headers/SyphonClient.ph
diff --git a/...amework/Versions/A/Headers/SyphonImage.ph → ...amework/Versions/A/Headers/SyphonImage.ph b/...amework/Versions/A/Headers/SyphonImage.ph → ...amework/Versions/A/Headers/SyphonImage.ph
diff --git a/...mework/Versions/A/Headers/SyphonServer.ph → ...mework/Versions/A/Headers/SyphonServer.ph b/...mework/Versions/A/Headers/SyphonServer.ph → ...mework/Versions/A/Headers/SyphonServer.ph
diff --git a/...rsions/A/Headers/SyphonServerDirectory.ph → ...rsions/A/Headers/SyphonServerDirectory.ph b/...rsions/A/Headers/SyphonServerDirectory.ph → ...rsions/A/Headers/SyphonServerDirectory.ph
diff --git a/...ated/parsed/Syphon/src/SyphonC4DServer.ph → ...ated/parsed/Syphon/src/SyphonC4DServer.ph b/...ated/parsed/Syphon/src/SyphonC4DServer.ph → ...ated/parsed/Syphon/src/SyphonC4DServer.ph
diff --git a/R20.055/SyphonR20/generated/parsed/main.ph → R20/SyphonR20/generated/parsed/main.ph b/R20.055/SyphonR20/generated/parsed/main.ph → R20/SyphonR20/generated/parsed/main.ph
diff --git a/...5/SyphonR20/generated/sourceprocessor.msg → R20/SyphonR20/generated/sourceprocessor.msg b/...5/SyphonR20/generated/sourceprocessor.msg → R20/SyphonR20/generated/sourceprocessor.msg
diff --git a/...SyphonR20/generated/sourceprocessor.stamp → ...SyphonR20/generated/sourceprocessor.stamp b/...SyphonR20/generated/sourceprocessor.stamp → ...SyphonR20/generated/sourceprocessor.stamp
diff --git a/...5/SyphonR20/project/projectdefinition.txt → R20/SyphonR20/project/projectdefinition.txt b/...5/SyphonR20/project/projectdefinition.txt → R20/SyphonR20/project/projectdefinition.txt
diff --git a/...oject/syphonr20.xcodeproj/project.pbxproj → ...oject/syphonr20.xcodeproj/project.pbxproj b/...oject/syphonr20.xcodeproj/project.pbxproj → ...oject/syphonr20.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/roger.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/roger.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/....xcuserdatad/WorkspaceSettings.xcsettings → ....xcuserdatad/WorkspaceSettings.xcsettings b/....xcuserdatad/WorkspaceSettings.xcsettings → ....xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/...xcshareddata/xcschemes/syphonr20.xcscheme → ...xcshareddata/xcschemes/syphonr20.xcscheme b/...xcshareddata/xcschemes/syphonr20.xcscheme → ...xcshareddata/xcschemes/syphonr20.xcscheme
diff --git a/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist b/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
diff --git a/R20.055/SyphonR20/res/c4d_symbols.h → R20/SyphonR20/res/c4d_symbols.h b/R20.055/SyphonR20/res/c4d_symbols.h → R20/SyphonR20/res/c4d_symbols.h
diff --git a/.../SyphonR20/res/description/SyphonPlugin.h → R20/SyphonR20/res/description/SyphonPlugin.h b/.../SyphonR20/res/description/SyphonPlugin.h → R20/SyphonR20/res/description/SyphonPlugin.h
diff --git a/...yphonR20/res/description/SyphonPlugin.res → ...yphonR20/res/description/SyphonPlugin.res b/...yphonR20/res/description/SyphonPlugin.res → ...yphonR20/res/description/SyphonPlugin.res
diff --git a/.../SyphonR20/res/strings_us/c4d_strings.str → R20/SyphonR20/res/strings_us/c4d_strings.str b/.../SyphonR20/res/strings_us/c4d_strings.str → R20/SyphonR20/res/strings_us/c4d_strings.str
diff --git a/...s/strings_us/description/SyphonPlugin.str → ...s/strings_us/description/SyphonPlugin.str b/...s/strings_us/description/SyphonPlugin.str → ...s/strings_us/description/SyphonPlugin.str
diff --git a/...ource/Syphon/lib/Syphon.framework/Headers → ...ource/Syphon/lib/Syphon.framework/Headers b/...ource/Syphon/lib/Syphon.framework/Headers → ...ource/Syphon/lib/Syphon.framework/Headers
diff --git a/...rce/Syphon/lib/Syphon.framework/Resources → ...rce/Syphon/lib/Syphon.framework/Resources b/...rce/Syphon/lib/Syphon.framework/Resources → ...rce/Syphon/lib/Syphon.framework/Resources
diff --git a/...source/Syphon/lib/Syphon.framework/Syphon → ...source/Syphon/lib/Syphon.framework/Syphon b/...source/Syphon/lib/Syphon.framework/Syphon → ...source/Syphon/lib/Syphon.framework/Syphon
diff --git a/...hon.framework/Versions/A/Headers/Syphon.h → ...hon.framework/Versions/A/Headers/Syphon.h b/...hon.framework/Versions/A/Headers/Syphon.h → ...hon.framework/Versions/A/Headers/Syphon.h
diff --git a/...amework/Versions/A/Headers/SyphonClient.h → ...amework/Versions/A/Headers/SyphonClient.h b/...amework/Versions/A/Headers/SyphonClient.h → ...amework/Versions/A/Headers/SyphonClient.h
diff --git a/...ramework/Versions/A/Headers/SyphonImage.h → ...ramework/Versions/A/Headers/SyphonImage.h b/...ramework/Versions/A/Headers/SyphonImage.h → ...ramework/Versions/A/Headers/SyphonImage.h
diff --git a/...amework/Versions/A/Headers/SyphonServer.h → ...amework/Versions/A/Headers/SyphonServer.h b/...amework/Versions/A/Headers/SyphonServer.h → ...amework/Versions/A/Headers/SyphonServer.h
diff --git a/...ersions/A/Headers/SyphonServerDirectory.h → ...ersions/A/Headers/SyphonServerDirectory.h b/...ersions/A/Headers/SyphonServerDirectory.h → ...ersions/A/Headers/SyphonServerDirectory.h
diff --git a/...Resources/English.lproj/InfoPlist.strings → ...Resources/English.lproj/InfoPlist.strings b/...Resources/English.lproj/InfoPlist.strings → ...Resources/English.lproj/InfoPlist.strings
diff --git a/...framework/Versions/A/Resources/Info.plist → ...framework/Versions/A/Resources/Info.plist b/...framework/Versions/A/Resources/Info.plist → ...framework/Versions/A/Resources/Info.plist
diff --git a/...on/lib/Syphon.framework/Versions/A/Syphon → ...on/lib/Syphon.framework/Versions/A/Syphon b/...on/lib/Syphon.framework/Versions/A/Syphon → ...on/lib/Syphon.framework/Versions/A/Syphon
diff --git a/...hon/lib/Syphon.framework/Versions/Current → ...hon/lib/Syphon.framework/Versions/Current b/...hon/lib/Syphon.framework/Versions/Current → ...hon/lib/Syphon.framework/Versions/Current
diff --git a/...onR20/source/Syphon/src/SyphonC4DServer.h → ...onR20/source/Syphon/src/SyphonC4DServer.h b/...onR20/source/Syphon/src/SyphonC4DServer.h → ...onR20/source/Syphon/src/SyphonC4DServer.h
diff --git a/...nR20/source/Syphon/src/SyphonC4DServer.mm → ...nR20/source/Syphon/src/SyphonC4DServer.mm b/...nR20/source/Syphon/src/SyphonC4DServer.mm → ...nR20/source/Syphon/src/SyphonC4DServer.mm
diff --git a/R20.055/SyphonR20/source/SyphonVP.cpp → R20/SyphonR20/source/SyphonVP.cpp b/R20.055/SyphonR20/source/SyphonVP.cpp → R20/SyphonR20/source/SyphonVP.cpp
diff --git a/R20.055/SyphonR20/source/install.sh → R20/SyphonR20/source/install.sh b/R20.055/SyphonR20/source/install.sh → R20/SyphonR20/source/install.sh
diff --git a/R20.055/SyphonR20/source/main.cpp → R20/SyphonR20/source/main.cpp b/R20.055/SyphonR20/source/main.cpp → R20/SyphonR20/source/main.cpp
diff --git a/R20.055/SyphonR20/source/main.h → R20/SyphonR20/source/main.h b/R20.055/SyphonR20/source/main.h → R20/SyphonR20/source/main.h
diff --git a/R20.055/SyphonR20/syphonr20.xlib → R20/SyphonR20/syphonr20.xlib b/R20.055/SyphonR20/syphonr20.xlib → R20/SyphonR20/syphonr20.xlib
diff --git a/R20/SyphonR21/generated/hxx/interface_registration.cpp b/R20/SyphonR21/generated/hxx/interface_registration.cpp
@@ -0,0 +1,3 @@
+#define MAXON_REGISTRATION_EXCLUDE_REFLECTION
+#define MAXON_REGISTRATION_EXCLUDE_REFLECTION_NONVIRTUAL
+#include "registration_com_studioavante_SyphonR20.hxx"
diff --git a/R20/SyphonR21/generated/hxx/reflection_registration.cpp b/R20/SyphonR21/generated/hxx/reflection_registration.cpp
@@ -0,0 +1,2 @@
+#define MAXON_REGISTRATION_EXCLUDE_INTERFACES
+#define MAXON_REGISTRATION_EXCLUDE_REFLECTION
diff --git a/R20/SyphonR21/generated/hxx/reflection_virtual_registration.cpp b/R20/SyphonR21/generated/hxx/reflection_virtual_registration.cpp
@@ -0,0 +1,2 @@
+#define MAXON_REGISTRATION_EXCLUDE_INTERFACES
+#define MAXON_REGISTRATION_EXCLUDE_REFLECTION_NONVIRTUAL
diff --git a/R20/SyphonR21/generated/hxx/register.cpp b/R20/SyphonR21/generated/hxx/register.cpp
@@ -0,0 +1 @@
+#include "register.hxx"
diff --git a/R20/SyphonR21/generated/hxx/register.hxx b/R20/SyphonR21/generated/hxx/register.hxx
@@ -0,0 +1,23 @@
+/*
+	DON'T EDIT THIS FILE!
+	It has been created and is updated automatically by the interface processor.
+	It has to be included by the register.cpp file of the project in order for the automatic registration to work.
+*/
+#define PRIVATE_MAXON_REGISTRATION_UNIT
+
+
+#ifndef PRIVATE_MAXON_REGISTRATION_FRAMEWORK
+#define PRIVATE_MAXON_DEFINE_MODULE_INFO_FLAGS 
+#include "maxon/register.h"
+#endif
+
+
+#ifdef PRIVATE_MAXON_REGISTRATION_FRAMEWORK
+
+
+#else
+
+static maxon::Id g_usedFrameworks[] = {maxon::Id("net.maxon.c4d.cinema.framework"), maxon::Id("net.maxon.core.framework"), maxon::Id("net.maxon.network.framework")};
+static maxon::SetUsedFrameworks g_setUsedFrameworks(PRIVATE_MAXON_MODULE, g_usedFrameworks);
+
+#endif
diff --git a/R20/SyphonR21/generated/hxx/registration_com_studioavante_SyphonR20.hxx b/R20/SyphonR21/generated/hxx/registration_com_studioavante_SyphonR20.hxx
@@ -0,0 +1,10 @@
+// Include this file in a cpp file of a single module to add the framework registration of com.studioavante.SyphonR20 to the module.
+
+#define PRIVATE_MAXON_REGISTRATION_FRAMEWORK
+#if !(defined(MAXON_REGISTRATION_EXCLUDE_REFLECTION) && defined(MAXON_REGISTRATION_EXCLUDE_REFLECTION_NONVIRTUAL))
+#include "maxon/reflection_registration.h"
+#else
+#include "maxon/apibase.h"
+#endif
+#undef MAXON_DEPENDENCY_ENABLE
+#include "register.hxx"
diff --git a/R20/SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/Syphon.ph b/R20/SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/Syphon.ph
diff --git a/...SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonClient.ph b/...SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonClient.ph
diff --git a/R20/SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonImage.ph b/R20/SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonImage.ph
diff --git a/...SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonServer.ph b/...SyphonR21/generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonServer.ph
diff --git a/.../generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonServerDirectory.ph b/.../generated/parsed/Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonServerDirectory.ph
diff --git a/R20/SyphonR21/generated/parsed/Syphon/src/SyphonC4DServer.ph b/R20/SyphonR21/generated/parsed/Syphon/src/SyphonC4DServer.ph
diff --git a/R20/SyphonR21/generated/parsed/main.ph b/R20/SyphonR21/generated/parsed/main.ph
diff --git a/R20/SyphonR21/generated/sourceprocessor.msg b/R20/SyphonR21/generated/sourceprocessor.msg
diff --git a/R20/SyphonR21/generated/sourceprocessor.stamp b/R20/SyphonR21/generated/sourceprocessor.stamp
@@ -0,0 +1,10 @@
+Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonClient.h
+main.cpp
+Syphon/lib/Syphon.framework/Versions/A/Headers/Syphon.h
+Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonServerDirectory.h
+Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonImage.h
+Syphon/src/SyphonC4DServer.h
+Syphon/lib/Syphon.framework/Versions/A/Headers/SyphonServer.h
+SyphonVP.cpp
+Syphon/src/SyphonC4DServer.mm
+main.h
diff --git a/R20/SyphonR21/project/projectdefinition.txt b/R20/SyphonR21/project/projectdefinition.txt
@@ -0,0 +1,20 @@
+// Supported platforms - can be [Win64;OSX]
+Platform=OSX
+
+// Type of project - can be [Lib;DLL;App]
+Type=DLL
+
+// API dependencies
+APIS=cinema.framework;core.framework;network.framework;
+
+// Classic C4D API
+C4D=true
+
+stylecheck=false
+
+// Custom ID
+ModuleId=com.studioavante.SyphonR20
+
+AdditionalLinkOptions=-headerpad_max_install_names
+
+FRAMEWORK_SEARCH_PATHS=../source/Syphon/lib
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#define MAXON_REGISTRATION_EXCLUDE_INTERFACES
		#define MAXON_REGISTRATION_EXCLUDE_REFLECTION