diff --git a/SpeckleConnector/Connector.sln b/SpeckleConnector/Connector.sln index 3949cfe..57c7d5a 100644 --- a/SpeckleConnector/Connector.sln +++ b/SpeckleConnector/Connector.sln @@ -6,9 +6,12 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Connector", "Connector.vcxproj", "{CB120C04-054F-485B-BB5F-1EDE23F7FACB}" ProjectSection(ProjectDependencies) = postProject {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC} = {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC} + {942743B7-B3CB-4F91-BE46-28937F5E3FD1} = {942743B7-B3CB-4F91-BE46-28937F5E3FD1} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveLib17", "..\ActiveLib\ActiveLib17.vcxproj", "{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActiveLib17", "..\..\ActiveLib\ActiveLib17.vcxproj", "{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeckleLib17", "..\SpeckleLib\SpeckleLib17.vcxproj", "{942743B7-B3CB-4F91-BE46-28937F5E3FD1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -18,28 +21,18 @@ Global Debug17|x86 = Debug17|x86 DebugAC27|x64 = DebugAC27|x64 DebugAC27|x86 = DebugAC27|x86 - DebugRV2024|x64 = DebugRV2024|x64 - DebugRV2024|x86 = DebugRV2024|x86 - DebugVS2019|x64 = DebugVS2019|x64 - DebugVS2019|x86 = DebugVS2019|x86 DebugVS2022|x64 = DebugVS2022|x64 DebugVS2022|x86 = DebugVS2022|x86 - DebugVW2024|x64 = DebugVW2024|x64 - DebugVW2024|x86 = DebugVW2024|x86 Release16|x64 = Release16|x64 Release16|x86 = Release16|x86 Release17|x64 = Release17|x64 Release17|x86 = Release17|x86 ReleaseAC27|x64 = ReleaseAC27|x64 ReleaseAC27|x86 = ReleaseAC27|x86 - ReleaseRV2024|x64 = ReleaseRV2024|x64 - ReleaseRV2024|x86 = ReleaseRV2024|x86 ReleaseVS2019|x64 = ReleaseVS2019|x64 ReleaseVS2019|x86 = ReleaseVS2019|x86 ReleaseVS2022|x64 = ReleaseVS2022|x64 ReleaseVS2022|x86 = ReleaseVS2022|x86 - ReleaseVW2024|x64 = ReleaseVW2024|x64 - ReleaseVW2024|x86 = ReleaseVW2024|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Debug16|x64.ActiveCfg = DebugVW2024|x64 @@ -54,22 +47,10 @@ Global {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x64.Build.0 = DebugAC27|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x86.ActiveCfg = DebugVW2024|Win32 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugAC27|x86.Build.0 = DebugVW2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugRV2024|x64.ActiveCfg = DebugRV2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugRV2024|x64.Build.0 = DebugRV2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugRV2024|x86.ActiveCfg = DebugVW2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugRV2024|x86.Build.0 = DebugVW2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2019|x64.ActiveCfg = DebugVW2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2019|x64.Build.0 = DebugVW2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2019|x86.ActiveCfg = DebugRV2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2019|x86.Build.0 = DebugRV2024|Win32 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x64.ActiveCfg = DebugVW2024|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x64.Build.0 = DebugVW2024|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x86.ActiveCfg = DebugRV2024|Win32 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVS2022|x86.Build.0 = DebugRV2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVW2024|x64.ActiveCfg = DebugVW2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVW2024|x64.Build.0 = DebugVW2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVW2024|x86.ActiveCfg = DebugVW2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.DebugVW2024|x86.Build.0 = DebugVW2024|Win32 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release16|x64.ActiveCfg = ReleaseVW2024|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release16|x64.Build.0 = ReleaseVW2024|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.Release16|x86.ActiveCfg = ReleaseAC27|Win32 @@ -82,10 +63,6 @@ Global {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x64.Build.0 = ReleaseAC27|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x86.ActiveCfg = ReleaseVW2024|Win32 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseAC27|x86.Build.0 = ReleaseVW2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseRV2024|x64.ActiveCfg = ReleaseRV2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseRV2024|x64.Build.0 = ReleaseRV2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseRV2024|x86.ActiveCfg = ReleaseVW2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseRV2024|x86.Build.0 = ReleaseVW2024|Win32 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x64.ActiveCfg = ReleaseVW2024|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x64.Build.0 = ReleaseVW2024|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2019|x86.ActiveCfg = ReleaseRV2024|Win32 @@ -94,10 +71,6 @@ Global {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2022|x64.Build.0 = ReleaseVW2024|x64 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2022|x86.ActiveCfg = ReleaseRV2024|Win32 {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVS2022|x86.Build.0 = ReleaseRV2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVW2024|x64.ActiveCfg = ReleaseVW2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVW2024|x64.Build.0 = ReleaseVW2024|x64 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVW2024|x86.ActiveCfg = ReleaseVW2024|Win32 - {CB120C04-054F-485B-BB5F-1EDE23F7FACB}.ReleaseVW2024|x86.Build.0 = ReleaseVW2024|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug16|x64.ActiveCfg = Debug16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug16|x64.Build.0 = Debug16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Debug16|x86.ActiveCfg = Debug16|Win32 @@ -110,22 +83,10 @@ Global {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x64.Build.0 = Debug16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x86.ActiveCfg = Debug17|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x86.Build.0 = Debug17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugRV2024|x64.ActiveCfg = Debug16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugRV2024|x64.Build.0 = Debug16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugRV2024|x86.ActiveCfg = Debug17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugRV2024|x86.Build.0 = Debug17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2019|x64.ActiveCfg = Debug16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2019|x64.Build.0 = Debug16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2019|x86.ActiveCfg = Debug17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2019|x86.Build.0 = Debug17|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x64.ActiveCfg = Debug16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x64.Build.0 = Debug16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x86.ActiveCfg = Debug17|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVS2022|x86.Build.0 = Debug17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVW2024|x64.ActiveCfg = Debug16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVW2024|x64.Build.0 = Debug16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVW2024|x86.ActiveCfg = Debug17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugVW2024|x86.Build.0 = Debug17|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release16|x64.ActiveCfg = Release16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release16|x64.Build.0 = Release16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.Release16|x86.ActiveCfg = Release16|Win32 @@ -138,10 +99,6 @@ Global {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x64.Build.0 = Release16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x86.ActiveCfg = Release17|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x86.Build.0 = Release17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseRV2024|x64.ActiveCfg = Release16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseRV2024|x64.Build.0 = Release16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseRV2024|x86.ActiveCfg = Release17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseRV2024|x86.Build.0 = Release17|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x64.ActiveCfg = Release16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x64.Build.0 = Release16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2019|x86.ActiveCfg = Release17|Win32 @@ -150,10 +107,42 @@ Global {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2022|x64.Build.0 = Release16|x64 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2022|x86.ActiveCfg = Release17|Win32 {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVS2022|x86.Build.0 = Release17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVW2024|x64.ActiveCfg = Release16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVW2024|x64.Build.0 = Release16|x64 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVW2024|x86.ActiveCfg = Release17|Win32 - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseVW2024|x86.Build.0 = Release17|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug16|x64.ActiveCfg = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug16|x64.Build.0 = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug16|x86.ActiveCfg = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug16|x86.Build.0 = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x64.ActiveCfg = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x64.Build.0 = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x86.ActiveCfg = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Debug17|x86.Build.0 = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x64.ActiveCfg = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x64.Build.0 = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x86.ActiveCfg = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugAC27|x86.Build.0 = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x64.ActiveCfg = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x64.Build.0 = DebugAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x86.ActiveCfg = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.DebugVS2022|x86.Build.0 = DebugAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release16|x64.ActiveCfg = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release16|x64.Build.0 = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release16|x86.ActiveCfg = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release16|x86.Build.0 = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x64.ActiveCfg = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x64.Build.0 = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x86.ActiveCfg = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.Release17|x86.Build.0 = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x64.ActiveCfg = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x64.Build.0 = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x86.ActiveCfg = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseAC27|x86.Build.0 = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x64.ActiveCfg = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x64.Build.0 = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x86.ActiveCfg = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2019|x86.Build.0 = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x64.ActiveCfg = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x64.Build.0 = ReleaseAC27|x64 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x86.ActiveCfg = ReleaseAC27|Win32 + {942743B7-B3CB-4F91-BE46-28937F5E3FD1}.ReleaseVS2022|x86.Build.0 = ReleaseAC27|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SpeckleConnector/Connector.vcxproj b/SpeckleConnector/Connector.vcxproj index 224ae60..40590d2 100644 --- a/SpeckleConnector/Connector.vcxproj +++ b/SpeckleConnector/Connector.vcxproj @@ -51,13 +51,12 @@ - - - - - + {64ebdbc7-ab2d-4ae1-8e54-922b6fa6e1cc} + + {942743b7-b3cb-4f91-be46-28937f5e3fd1} + @@ -72,6 +71,9 @@ true true + + + @@ -90,7 +92,15 @@ - + + + + + + + + + 16.0 @@ -218,32 +228,32 @@ - + - + - + - + - + - + @@ -270,33 +280,39 @@ $(SourcePath) .vlb $(Platform)\$(Configuration)\ + $(BASE_NAME) true $(SourcePath) .dll $(Platform)\$(Configuration)\ + $(BASE_NAME) true $(SourcePath) .apx $(Platform)\$(Configuration)\ + $(BASE_NAME) false .vlb $(Platform)\$(Configuration)\ + $(BASE_NAME) false .dll $(Platform)\$(Configuration)\ + $(BASE_NAME) false .apx $(Platform)\$(Configuration)\ + $(BASE_NAME) @@ -416,12 +432,12 @@ stdcpp20 - ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/ActiveBIM/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Kernel/;$(HEADER_PATH_5)/Interfaces/;$(HEADER_PATH_5)/VWMM/ + ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/SpeckleLib/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Kernel/;$(HEADER_PATH_5)/Interfaces/;$(HEADER_PATH_5)/VWMM/ ProgramDatabase true Cdecl Default - ./ActiveBIM/Vectorworks/DebugPrefix.h + ./SpeckleLib/Vectorworks/DebugPrefix.h true true false @@ -445,14 +461,14 @@ SET TARGETNAME=$(TargetName) SET TARGETDIR=$(TargetDir) SET BIMVERSION=$(BIM_VERSION) -CALL "$(ProjectDir)..\ActiveBIM\Make.win\buildResVW.bat" +CALL "$(ProjectDir)..\SpeckleLib\Make.win\buildResVW.bat" ECHO ON ECHO "Starting Install" set CONFIGURATION=$(Configuration) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) set RESOURCE_EXTENSION=$(Resource_Extension) -CALL "$(ProjectDir)..\ActiveBIM\Make.win\install.bat" +CALL "$(ProjectDir)..\SpeckleLib\Make.win\install.bat" Creating VWR File @@ -474,7 +490,7 @@ CALL "$(ProjectDir)..\ActiveBIM\Make.win\install.bat" stdcpp20 - ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/ActiveBIM/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/ + ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/SpeckleLib/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/ ProgramDatabase true Cdecl @@ -507,7 +523,7 @@ set CONFIGURATION=$(Configuration) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) set RESOURCE_EXTENSION=$(Resource_Extension) -CALL "$(ProjectDir)..\ActiveBIM\Make.win\install.bat" +CALL "$(ProjectDir)..\SpeckleLib\Make.win\install.bat" Installing @@ -570,7 +586,7 @@ ECHO "Starting Install" set CONFIGURATION=$(Configuration) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) -"$(ProjectDir)..\ActiveBIM\Make.win\install.bat" +"$(ProjectDir)..\SpeckleLib\Make.win\install.bat" Creating VWR File @@ -578,7 +594,7 @@ set SYMROOT=$(SolutionDir) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) -"$(ProjectDir)..\ActiveBIM\Make.win\buildResAC.bat" +"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat" $(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories) @@ -596,9 +612,9 @@ set SYMROOT=$(SolutionDir) NotUsing - ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/ActiveBIM/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Kernel/;$(HEADER_PATH_5)/Interfaces/;$(HEADER_PATH_5)/VWMM/ + ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/SpeckleLib/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Kernel/;$(HEADER_PATH_5)/Interfaces/;$(HEADER_PATH_5)/VWMM/ stdcpp20 - ./ActiveBIM/Vectorworks/ReleasePrefix.h + ./SpeckleLib/Vectorworks/ReleasePrefix.h true true false @@ -629,14 +645,14 @@ set SYMROOT=$(SolutionDir) SET TARGETNAME=$(TargetName) SET TARGETDIR=$(TargetDir) SET BIMVERSION=$(BIM_VERSION) -CALL "$(ProjectDir)..\ActiveBIM\Make.win\buildResVW.bat" +CALL "$(ProjectDir)..\SpeckleLib\Make.win\buildResVW.bat" ECHO ON ECHO "Starting Install" set CONFIGURATION=$(Configuration) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) set RESOURCE_EXTENSION=$(Resource_Extension) -CALL "$(ProjectDir)..\ActiveBIM\Make.win\install.bat" +CALL "$(ProjectDir)..\SpeckleLib\Make.win\install.bat" Creating VWR File @@ -654,7 +670,7 @@ CALL "$(ProjectDir)..\ActiveBIM\Make.win\install.bat" NotUsing - ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/ActiveBIM/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/ + ./;$(HEADER_PATH_1);$(HEADER_PATH_2);$(HEADER_PATH_3);$(HEADER_PATH_3)/SpeckleLib/$(BIM_PLATFORM);$(HEADER_PATH_4)/;$(HEADER_PATH_5)/ stdcpp20 @@ -691,7 +707,7 @@ set CONFIGURATION=$(Configuration) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) set RESOURCE_EXTENSION=$(Resource_Extension) -CALL "$(ProjectDir)..\ActiveBIM\Make.win\install.bat" +CALL "$(ProjectDir)..\SpeckleLib\Make.win\install.bat" Installing @@ -753,11 +769,11 @@ SET TARGETNAME=$(TargetName) SET TARGETDIR=$(TargetDir) SET BIMVERSION=$(BIM_VERSION) ECHO ON -ECHO "Starting Install" +ECHO "Starting Install $(TargetName)" set CONFIGURATION=$(Configuration) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) -"$(ProjectDir)..\ActiveBIM\Make.win\install.bat" +"$(ProjectDir)..\SpeckleLib\Make.win\install.bat" Creating VWR File @@ -765,7 +781,7 @@ set SYMROOT=$(SolutionDir) set PLATFORM_NAME=$(Platform) set SYMROOT=$(SolutionDir) -"$(ProjectDir)..\ActiveBIM\Make.win\buildResAC.bat" +"$(ProjectDir)..\SpeckleLib\Make.win\buildResAC.bat" $(HEADER_PATH_5)\Inc;$(HEADER_PATH_5)\Modules\DGLib;$(RES_OUTPUT);%(AdditionalIncludeDirectories) diff --git a/SpeckleConnector/Connector.vcxproj.filters b/SpeckleConnector/Connector.vcxproj.filters index 071a1ee..94b610d 100644 --- a/SpeckleConnector/Connector.vcxproj.filters +++ b/SpeckleConnector/Connector.vcxproj.filters @@ -5,20 +5,15 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - + {3e120d58-60af-4e4b-a308-c32198aad172} - - {f993adf9-f6ea-48dd-a5a6-d980b5bac7bb} + + {9e90da7d-1c9a-4ef5-827f-b0c03bf3a3b1} + + + {c74d6482-b21c-4a58-a233-d529b7ba2253} - - - - Source - - - Source\Tool - @@ -27,6 +22,15 @@ Resource Files + + Resource Files + + + Resource Files + + + Resource Files + @@ -34,8 +38,28 @@ - - Source\Tool + + Connector + + + Connector\Interface + + + Connector\Interface + + + + + Connector + + + Connector\Event + + + Connector\Interface + + + Connector\Interface \ No newline at end of file diff --git a/SpeckleConnector/Make.win/ConnectorAC27.props b/SpeckleConnector/Make.win/ConnectorAC27.props index 0df4bf5..f4cf3cd 100644 --- a/SpeckleConnector/Make.win/ConnectorAC27.props +++ b/SpeckleConnector/Make.win/ConnectorAC27.props @@ -4,7 +4,7 @@ $(SolutionDir)RINT.$(BIM_PLATFORM)/$(LOCALISATION_SUFFIX) 64 - Connector + Speckle Connector $(BASE_NAME) apx EN-GB diff --git a/SpeckleConnector/RFIX.WIN/CodesignImport.apx.mui b/SpeckleConnector/RFIX.WIN/CodesignImport.apx.mui new file mode 100644 index 0000000..2bc70c6 Binary files /dev/null and b/SpeckleConnector/RFIX.WIN/CodesignImport.apx.mui differ diff --git a/SpeckleConnector/RFIX.WIN/Connector.rc b/SpeckleConnector/RFIX.WIN/Connector.rc index cca6f5c..8a453da 100644 --- a/SpeckleConnector/RFIX.WIN/Connector.rc +++ b/SpeckleConnector/RFIX.WIN/Connector.rc @@ -6,6 +6,9 @@ #include "DGDefs.h" #include "Connector.grc.rc2" +#include "ConnectorMenu.grc.rc2" +#include "SpecklePalette.grc.rc2" + #include "ConnectorFix.grc.rc2" 1 ICON LOADONCALL MOVEABLE IMPURE ACAP.ico diff --git a/SpeckleConnector/debug.log b/SpeckleConnector/debug.log new file mode 100644 index 0000000..2dd8386 --- /dev/null +++ b/SpeckleConnector/debug.log @@ -0,0 +1,79 @@ +[0810/122850.253:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/122851.572:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/122855.717:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/122855.763:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/122856.062:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/122856.176:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/122922.981:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123253.626:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123254.851:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123258.765:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123258.787:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123259.043:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123259.150:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123310.318:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123711.321:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123712.821:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123717.061:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123717.078:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123717.470:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123717.508:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123800.299:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123905.816:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123906.937:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123910.911:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123910.928:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123911.302:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123911.417:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123914.473:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123951.842:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123953.033:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/123956.997:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123957.017:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/123957.273:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123957.296:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/123958.945:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124107.275:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/124108.520:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/124112.436:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124112.438:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124112.663:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/124112.734:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/124115.329:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124231.297:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/124232.596:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/124236.752:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124236.800:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124237.212:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/124237.396:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/124239.285:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124431.294:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/124431.322:ERROR:gpu_init.cc(525)] Passthrough is not supported, GL is disabled, ANGLE is +[0810/124851.299:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/124852.502:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/124856.768:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124856.770:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/124857.088:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/124857.194:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/124907.425:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/125730.284:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/125731.439:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/125735.375:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/125735.405:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/125735.671:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/125735.751:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/125738.248:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/130032.823:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/130034.069:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/130038.017:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/130038.051:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/130038.339:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/130038.457:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/130041.288:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/130248.608:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/130249.798:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: gpu-process +[0810/130253.717:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/130253.731:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility +[0810/130254.034:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/130254.075:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: renderer +[0810/130255.679:INFO:crash_reporting.cc(216)] Crash reporting enabled for process: utility diff --git a/SpeckleLib/Make.win/AC27.props b/SpeckleLib/Make.win/AC27.props index 4d6a391..fda8ba7 100644 --- a/SpeckleLib/Make.win/AC27.props +++ b/SpeckleLib/Make.win/AC27.props @@ -5,11 +5,12 @@ 27 ARCHICAD C:\Program Files\Graphisoft\$(BIM_PLATFORM) $(BIM_VERSION) - $(SolutionDir)../ActiveLib - - $(SolutionDir)../ActiveBIM - $(SolutionDir)../ZipArchive/ - $(SolutionDir)../$(BIM_PLATFORM) $(BIM_VERSION)/Support + $(SolutionDir)..\..\ActiveLib + $(SolutionDir) + + + $(SolutionDir)..\SpeckleLib + $(SolutionDir)..\..\$(BIM_PLATFORM) $(BIM_VERSION)\Support $(SolutionDir) 64 1 diff --git a/SpeckleLib/Make.win/RV2024.props b/SpeckleLib/Make.win/RV2024.props new file mode 100644 index 0000000..297b98c --- /dev/null +++ b/SpeckleLib/Make.win/RV2024.props @@ -0,0 +1,66 @@ + + + + + 2024 + Revit + C:\Program Files\Autodesk\$(BIM_PLATFORM) $(BIM_VERSION) + $(SolutionDir)../ActiveLib + $(SolutionDir)../CeruleanLib + $(SolutionDir)../CeruleanBIM + $(SolutionDir)../boost.org + + + $(SolutionDir) + 64 + + + + + + + $(BIM_VERSION) + true + + + $(BIM_PLATFORM) + true + + + $(BIM_PATH) + true + + + $(HEADER_PATH_1) + true + + + $(HEADER_PATH_2) + true + + + $(HEADER_PATH_3) + true + + + $(HEADER_PATH_4) + true + + + $(HEADER_PATH_5) + true + + + $(HEADER_PATH_6) + true + + + $(WORD_SIZE) + true + + + $(REVIT) + true + + + \ No newline at end of file diff --git a/SpeckleLib/Make.win/VW2024.props b/SpeckleLib/Make.win/VW2024.props new file mode 100644 index 0000000..f77b724 --- /dev/null +++ b/SpeckleLib/Make.win/VW2024.props @@ -0,0 +1,63 @@ + + + + + 2024 + Vectorworks + C:\Program Files\$(BIM_PLATFORM) $(BIM_VERSION) + $(SolutionDir)../ActiveLib + $(SolutionDir)../CeruleanLib + $(SolutionDir)../CeruleanBIM + $(SolutionDir)../boost.org + $(SolutionDir)../$(BIM_PLATFORM) $(BIM_VERSION)/SDKLib/Include + $(SolutionDir) + 64 + + + + + + + + $(BIM_VERSION) + + + $(BIM_PLATFORM) + + + $(BIM_PATH) + + + $(HEADER_PATH_1) + true + + + $(HEADER_PATH_2) + true + + + $(HEADER_PATH_3) + true + + + $(HEADER_PATH_4) + true + + + $(HEADER_PATH_5) + true + + + $(HEADER_PATH_6) + true + + + $(WORD_SIZE) + true + + + $(VECTORWORKS) + true + + + \ No newline at end of file diff --git a/SpeckleLib/SpeckleLib17.sln b/SpeckleLib/SpeckleLib17.sln index 960d471..06e4531 100644 --- a/SpeckleLib/SpeckleLib17.sln +++ b/SpeckleLib/SpeckleLib17.sln @@ -3,57 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34309.116 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeckleLib17", "SpeckleLib17.vcxproj", "{44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeckleLibDoctest", "SpeckleLibDoctest\SpeckleLib17Test.vcxproj", "{17C70158-2844-4B07-935D-0A52CED22677}" - ProjectSection(ProjectDependencies) = postProject - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F} = {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeckleLib17", "SpeckleLib17.vcxproj", "{64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug16|x64 = Debug16|x64 - Debug16|x86 = Debug16|x86 - Debug17|x64 = Debug17|x64 - Debug17|x86 = Debug17|x86 - Release16|x64 = Release16|x64 - Release16|x86 = Release16|x86 - Release17|x64 = Release17|x64 - Release17|x86 = Release17|x86 + DebugAC27|x64 = DebugAC27|x64 + DebugAC27|x86 = DebugAC27|x86 + ReleaseAC27|x64 = ReleaseAC27|x64 + ReleaseAC27|x86 = ReleaseAC27|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug16|x64.ActiveCfg = Debug16|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug16|x64.Build.0 = Debug16|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug16|x86.ActiveCfg = Debug17|Win32 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug16|x86.Build.0 = Debug17|Win32 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug17|x64.ActiveCfg = Debug17|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug17|x64.Build.0 = Debug17|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug17|x86.ActiveCfg = Debug17|Win32 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Debug17|x86.Build.0 = Debug17|Win32 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release16|x64.ActiveCfg = Release16|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release16|x64.Build.0 = Release16|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release16|x86.ActiveCfg = Release17|Win32 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release16|x86.Build.0 = Release17|Win32 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release17|x64.ActiveCfg = Release17|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release17|x64.Build.0 = Release17|x64 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release17|x86.ActiveCfg = Release17|Win32 - {44A0EA3A-1BB3-4C8B-A544-63CAE4C8F94F}.Release17|x86.Build.0 = Release17|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug16|x64.ActiveCfg = Debug16|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug16|x64.Build.0 = Debug16|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug16|x86.ActiveCfg = Debug16|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug16|x86.Build.0 = Debug16|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug17|x64.ActiveCfg = Debug17|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug17|x64.Build.0 = Debug17|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug17|x86.ActiveCfg = Debug17|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Debug17|x86.Build.0 = Debug17|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Release16|x64.ActiveCfg = Release16|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Release16|x64.Build.0 = Release16|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Release16|x86.ActiveCfg = Release16|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Release16|x86.Build.0 = Release16|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Release17|x64.ActiveCfg = Release17|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Release17|x64.Build.0 = Release17|x64 - {17C70158-2844-4B07-935D-0A52CED22677}.Release17|x86.ActiveCfg = Release17|Win32 - {17C70158-2844-4B07-935D-0A52CED22677}.Release17|x86.Build.0 = Release17|Win32 + {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x64.ActiveCfg = ReleaseAC27|x64 + {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x64.Build.0 = ReleaseAC27|x64 + {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.DebugAC27|x86.ActiveCfg = DebugAC27|Win32 + {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x64.ActiveCfg = ReleaseAC27|x64 + {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x64.Build.0 = ReleaseAC27|x64 + {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC}.ReleaseAC27|x86.ActiveCfg = ReleaseAC27|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj index 9ce937b..768ba90 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj +++ b/SpeckleLib/SpeckleLib17.vcxproj @@ -1,259 +1,75 @@ - - Debug16 + + DebugAC27 Win32 - - Debug16 + + DebugAC27 x64 - - Debug17 + + ReleaseAC27 Win32 - - Release16 - Win32 - - - Release16 - x64 - - - Release17 - Win32 - - - Debug17 - x64 - - - Release17 + + ReleaseAC27 x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + + 16.0 Win32Proj - {64EBDBC7-AB2D-4AE1-8E54-922B6FA6E1CC} + {942743B7-B3CB-4F91-BE46-28937F5E3FD1} SpeckleLib 10.0.22621.0 - + StaticLibrary true v143 Unicode - - StaticLibrary - true - v143 - Unicode - - - StaticLibrary - false - v143 - true - Unicode - - - - + StaticLibrary false v142 true Unicode - - StaticLibrary - true - v143 - Unicode - x64 - - - - + StaticLibrary true v142 @@ -262,17 +78,7 @@ - - StaticLibrary - false - v143 - true - Unicode - - - x64 - - + StaticLibrary false v142 @@ -287,62 +93,37 @@ - + - + - + + - - - - - - - - - - - - - + + - + true - - true - - + false - - false - - + true $(SourcePath) $(Platform)\$(Configuration)\ - - true - $(SourcePath) - $(Platform)\$(Configuration)\ - - + false $(Platform)\$(Configuration)\ - - false - $(Platform)\$(Configuration)\ - - + Level3 true @@ -358,23 +139,7 @@ true - - - Level3 - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - Use - pch.h - true - - - - - true - - - + Level3 true @@ -395,68 +160,12 @@ true - - - Level3 - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - Use - pch.h - true - stdcpp20 - - - - - true - true - true - - - + Level3 - WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions) - false - NotUsing - - - false - true - - stdcpp20 - ./ - ProgramDatabase - true - Cdecl - Default - false - Default - false - /utf-8 %(AdditionalOptions) - true - - - - - true - - - - - - - - - Level3 - - - WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions) + WINDOWS;ARCHICAD;ACExtension;_DEBUG;_LIB;%(PreprocessorDefinitions) false NotUsing @@ -466,7 +175,7 @@ stdcpp20 - ./ + ./;../../ActiveLib/;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited) ProgramDatabase true Cdecl @@ -476,6 +185,8 @@ false /utf-8 %(AdditionalOptions) true + true + TurnOffAllWarnings @@ -487,49 +198,18 @@ - + Level3 false true true - WINDOWS;NDEBUG;_LIB;%(PreprocessorDefinitions) + WINDOWS;ARCHICAD;ACExtension;NDEBUG;_LIB;%(PreprocessorDefinitions) true NotUsing - ./ - stdcpp20 - true - - - /utf-8 %(AdditionalOptions) - true - - - - - true - true - true - - - - - - - - - Level3 - false - true - true - WINDOWS;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - NotUsing - - - ./ + ./;../../ActiveLib/;$(HEADER_PATH_1)/;$(HEADER_PATH_2)/;$(HEADER_PATH_3)/;$(HEADER_PATH_3)/$(BIM_PLATFORM)/;$(HEADER_PATH_4)/;$(HEADER_PATH_5)/;$(HEADER_PATH_5)/Inc;$(HEADER_PATH_5)/Modules/AnalyticalModelAPI;$(HEADER_PATH_5)/Modules/ArchicadAPI;$(HEADER_PATH_5)/Modules/Brep;$(HEADER_PATH_5)/Modules/BuiltInLibrary;$(HEADER_PATH_5)/Modules/CADInfrastructureBase;$(HEADER_PATH_5)/Modules/CommunicationClient;$(HEADER_PATH_5)/Modules/CommunicationCommon;$(HEADER_PATH_5)/Modules/DGGraphix;$(HEADER_PATH_5)/Modules/DGLib;$(HEADER_PATH_5)/Modules/DesignVariantAPI;$(HEADER_PATH_5)/Modules/GDL;$(HEADER_PATH_5)/Modules/GSMSections;$(HEADER_PATH_5)/Modules/GSModelDevLib;$(HEADER_PATH_5)/Modules/GSModeler;$(HEADER_PATH_5)/Modules/GSModeler2D;$(HEADER_PATH_5)/Modules/GSRoot;$(HEADER_PATH_5)/Modules/GSUtils;$(HEADER_PATH_5)/Modules/GSXML;$(HEADER_PATH_5)/Modules/GSXMLUtils;$(HEADER_PATH_5)/Modules/GX;$(HEADER_PATH_5)/Modules/GXImage;$(HEADER_PATH_5)/Modules/GXImageBase;$(HEADER_PATH_5)/Modules/GXMedia;$(HEADER_PATH_5)/Modules/Geometry;$(HEADER_PATH_5)/Modules/Graphix;$(HEADER_PATH_5)/Modules/HTTP;$(HEADER_PATH_5)/Modules/InputOutput;$(HEADER_PATH_5)/Modules/JSON;$(HEADER_PATH_5)/Modules/JSONConversion;$(HEADER_PATH_5)/Modules/JavascriptEngine;$(HEADER_PATH_5)/Modules/LibXL;$(HEADER_PATH_5)/Modules/MEPAPI;$(HEADER_PATH_5)/Modules/MPIInterfaceDevLib;$(HEADER_PATH_5)/Modules/MPIInterfaceImpDevLib;$(HEADER_PATH_5)/Modules/Model3D;$(HEADER_PATH_5)/Modules/Model3DViewerControl;$(HEADER_PATH_5)/Modules/Network;$(HEADER_PATH_5)/Modules/Pattern;$(HEADER_PATH_5)/Modules/PointCloud;$(HEADER_PATH_5)/Modules/PointCloudManager;$(HEADER_PATH_5)/Modules/QGDrawing;$(HEADER_PATH_5)/Modules/RS;$(HEADER_PATH_5)/Modules/RapidJSON;$(HEADER_PATH_5)/Modules/SecureCommunication;$(HEADER_PATH_5)/Modules/TWClientLib;$(HEADER_PATH_5)/Modules/TWRoot;$(HEADER_PATH_5)/Modules/TextEngine;$(HEADER_PATH_5)/Modules/TransparentWindowLib;$(HEADER_PATH_5)/Modules/UCLib;$(HEADER_PATH_5)/Modules/UDLib;$(HEADER_PATH_5)/Modules/UserInterfaceAPI;$(HEADER_PATH_5)/Modules/VBElemDialogs;$(HEADER_PATH_5)/Modules/VBUtils;$(HEADER_PATH_5)/Modules/VectorImage $(inherited) stdcpp20 true @@ -538,6 +218,8 @@ /utf-8 %(AdditionalOptions) true + true + TurnOffAllWarnings diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters index 7173799..010230e 100644 --- a/SpeckleLib/SpeckleLib17.vcxproj.filters +++ b/SpeckleLib/SpeckleLib17.vcxproj.filters @@ -8,583 +8,103 @@ {bacfd662-e289-4d32-925c-478df65d01ba} - - {fccb627d-9084-44a2-8668-12ace3efc5d3} - - - {fce9ca8b-2049-4158-a66d-753d0db9624f} - - - {77038827-0b43-46c9-ba84-485ca6677995} - {23bca613-7f6a-40bd-af6c-6da6288e6461} - - {ce5a1f2f-a851-4b91-ad98-630bf6a4795c} - {2872ccda-08d8-4a2e-9d0a-345ac5b63187} - - {d4e29f94-8464-40d2-8712-5b07f08023bb} - - - {99fa8353-03a8-4755-9514-83fd647435d1} - - - {63e5ba37-04e3-4eb7-8507-3a544c3ebb68} - - - {e3a44283-b6ad-4d23-9071-4b8316d10631} - - - {f236a8b4-cbd3-4190-9f3b-5267ef7bf11f} - - - {16b2d4a1-c813-414f-a914-320eac070ea2} - - - {3e1d167a-ab92-4fe4-8ca5-2e2b800dd425} - - - {807ffd4b-afbc-4ee1-997f-a9fca156a0c2} - - - {941563ed-cdc5-4a85-98ae-7073541fed68} - - - {c8bf5c99-230f-4330-8856-e524c301f594} - - - {7779749e-242f-4775-8c64-d7052aa99d38} - - - {ebe91a04-7c60-4d76-a7ef-df2b4fdf23f2} - - - {053c9a32-3700-46f9-9631-3c84812bedfc} - - - {00955044-4ada-4263-875f-1c30895afd67} - - - {63c0c992-09d4-4445-972c-4e726270ed4b} - - - {663b795b-894e-4d4f-b388-18a88f1da3ab} - - - {2c4d0103-93f0-48d5-b616-955e81ed86f8} - {6bf46721-5a13-4cc0-9645-dd25106baf93} + + {2c4d0103-93f0-48d5-b616-955e81ed86f8} + + + {fccb627d-9084-44a2-8668-12ace3efc5d3} + + + {2828f96b-4fb0-4286-a9ae-13d111064e23} + + + {f691d452-4473-43b3-8f99-efe401397c5e} + + + {2eb94e5f-1177-4a92-a79a-a3ccc3357966} + - - Speckle\Container + + Speckle\Database\Content - - Speckle\Container + + Speckle\Database\Content - - Speckle\Container + + Speckle\Environment - - Speckle\Container + + Speckle\Event\Subscriber - - Speckle\Container + + Speckle\Event\Subscriber - - Speckle\File + + Speckle\Event\Type - - Speckle\File - - - Speckle\File - - - Speckle\File\Interface - - - Speckle\File\Interface - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Utility - - - Speckle\Utility - - - Speckle\Utility - - - Speckle\Utility + + Speckle\Event\Type Speckle\Utility - - Speckle\Utility - - - Speckle\Utility - - - Speckle\Utility - Speckle\Utility - - Speckle\Utility - - - Speckle\Utility - - - Speckle\Utility - - - Speckle\Setting - - - Speckle\Setting - - - Speckle\Setting - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Setting\Values - - - Speckle\Serialise - - - Speckle\Serialise\Generic - - - Speckle\Serialise\Inventory - - - Speckle\Serialise\Inventory - - - Speckle\Serialise\Inventory - - - Speckle\Serialise\Item - - - Speckle\Serialise\Item - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\JSON - - - Speckle\Serialise\XML - - - Speckle\Serialise\XML\Item - - - Speckle\Serialise\XML\Item - - - Speckle\Serialise\XML\Package - - - Speckle\Serialise\XML\Package\Wrapper - - - Speckle\Serialise\XML\Package\Wrapper\Geometry - - - Speckle\Serialise\XML\Package\Wrapper\Geometry - - - Speckle\Serialise\XML\Package\Wrapper\Geometry - - - Speckle\Serialise\Package - - - Speckle\Serialise\Package - - - Speckle\Serialise\Package - - - Speckle\Serialise\Package - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\Document - - - Speckle\Serialise\Document - - - Speckle\Serialise\Document - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement - - - Speckle\Setting\Values\Measurement - - - Speckle\Setting\Values\Measurement - - - Speckle\Serialise\Generic - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Attributes - - - Speckle\Attributes - - - Speckle\Attributes - - - Speckle\Attributes - - - Speckle\Event - - - Speckle\Event - - - Speckle\Event - - - Speckle\Event - - - Speckle\Event - - - Speckle\Event - - - Speckle\Setting - - - Speckle\File + + Speckle\Database\Content - - Speckle\File + + Speckle\Environment - - Speckle\File + + Speckle\Event\Subscriber - - Speckle\File\Interface - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Utility - - - Speckle\Utility + + Speckle\Event\Subscriber Speckle\Utility - - Speckle\Utility - Speckle\Utility - - Speckle\Utility - - - Speckle\Utility - - - Speckle\Utility - - - Speckle\Setting - - - Speckle\Serialise\Generic - - - Speckle\Serialise\Inventory - - - Speckle\Serialise\JSON - - - Speckle\Serialise\XML - - - Speckle\Serialise\XML\Item - - - Speckle\Serialise\XML\Package - - - Speckle\Serialise\XML\Package\Wrapper - - - Speckle\Serialise\XML\Package\Wrapper\Geometry - - - Speckle\Serialise\XML\Package\Wrapper\Geometry - - - Speckle\Serialise\Package - - - Speckle\Geometry - - - Speckle\Setting\Values - - - Speckle\Serialise\Item - - - Speckle\Serialise\Item\Wrapper - - - Speckle\Serialise\Document - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement\Units - - - Speckle\Setting\Values\Measurement - - - Speckle\Serialise\Generic - - - Speckle\Utility - - - Speckle\Geometry - - - Speckle\Geometry - - - Speckle\Attributes - - - Speckle\Event - - - Speckle\Setting - Speckle + + Speckle\Environment + + + Speckle\Event + + + Speckle\Serialise + + + Speckle\Environment + Speckle\Event + + Speckle\Serialise + \ No newline at end of file