Skip to content

Commit 37222db

Browse files
CrossVRCrossVR
committed
Add FreeMagic as a submodule.
1 parent 7f8af89 commit 37222db

File tree

8 files changed

+43
-13
lines changed

8 files changed

+43
-13
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@
3737
[submodule "src/Externals/cryptopp"]
3838
path = src/Externals/cryptopp
3939
url = https://github.com/weidai11/cryptopp.git
40+
[submodule "src/Externals/FreeMagic"]
41+
path = src/Externals/FreeMagic
42+
url = https://github.com/OpenXRay/FreeMagic.git

‎src/Externals/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# exclude third-party libraries (except submodules)
22
3dsmax
33
lightwave
4-
MagicSoftware
54
maya
65
nvapi
76
OpenAutomate

‎src/Externals/FreeMagic

Submodule FreeMagic added at ba39f90

‎src/engine.sln

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BugTrap", "Externals\BugTra
182182
EndProject
183183
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptdll", "Externals\cryptdll.vcxproj", "{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}"
184184
EndProject
185+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MagicFM", "Externals\FreeMagic\Source\MagicFM.vcxproj", "{848E8AB3-9962-4C04-B813-5690399C8A3E}"
186+
EndProject
185187
Global
186188
GlobalSection(SolutionConfigurationPlatforms) = preSolution
187189
Debug_Dedicated|Mixed Platforms = Debug_Dedicated|Mixed Platforms
@@ -1660,6 +1662,30 @@ Global
16601662
{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Release|Mixed Platforms.Build.0 = Release|Win32
16611663
{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Release|Win32.ActiveCfg = Release|Win32
16621664
{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257}.Release|Win32.Build.0 = Release|Win32
1665+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
1666+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
1667+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
1668+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
1669+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
1670+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
1671+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug|Win32.ActiveCfg = Debug|Win32
1672+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Debug|Win32.Build.0 = Debug|Win32
1673+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
1674+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
1675+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
1676+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
1677+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
1678+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed|Mixed Platforms.Build.0 = Release|Win32
1679+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed|Win32.ActiveCfg = Release|Win32
1680+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Mixed|Win32.Build.0 = Release|Win32
1681+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
1682+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
1683+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
1684+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release_Dedicated|Win32.Build.0 = Release|Win32
1685+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
1686+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release|Mixed Platforms.Build.0 = Release|Win32
1687+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release|Win32.ActiveCfg = Release|Win32
1688+
{848E8AB3-9962-4C04-B813-5690399C8A3E}.Release|Win32.Build.0 = Release|Win32
16631689
EndGlobalSection
16641690
GlobalSection(SolutionProperties) = preSolution
16651691
HideSolutionNode = FALSE
@@ -1721,6 +1747,7 @@ Global
17211747
{938C5808-85A1-4B5A-8CB4-D2D9D7851CB8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
17221748
{E8CF1ADA-264A-4127-86C2-FD7057D3792C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
17231749
{94A428A1-9BA8-4DB2-B76E-BD2E3C08F257} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
1750+
{848E8AB3-9962-4C04-B813-5690399C8A3E} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
17241751
EndGlobalSection
17251752
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
17261753
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

‎src/plugins/Maya/Maya_Export2008.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</Midl>
8686
<ClCompile>
8787
<Optimization>Disabled</Optimization>
88-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88+
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8989
<PreprocessorDefinitions>NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9090
<StringPooling>true</StringPooling>
9191
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -119,7 +119,7 @@
119119
</Midl>
120120
<ClCompile>
121121
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
122-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122+
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123123
<PreprocessorDefinitions>NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124124
<StringPooling>true</StringPooling>
125125
<MinimalRebuild>false</MinimalRebuild>
@@ -154,7 +154,7 @@
154154
</Midl>
155155
<ClCompile>
156156
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
157-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
157+
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2008/include;../Shared;$(SolutionDir)utils/xrQSlim/src;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158158
<PreprocessorDefinitions>NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159159
<StringPooling>true</StringPooling>
160160
<MinimalRebuild>false</MinimalRebuild>

‎src/plugins/Maya/Maya_Export2009.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</Midl>
8686
<ClCompile>
8787
<Optimization>Disabled</Optimization>
88-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88+
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8989
<PreprocessorDefinitions>NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9090
<StringPooling>true</StringPooling>
9191
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
120120
</Midl>
121121
<ClCompile>
122122
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
123-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123+
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
124124
<PreprocessorDefinitions>NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125125
<StringPooling>true</StringPooling>
126126
<MinimalRebuild>false</MinimalRebuild>
@@ -155,7 +155,7 @@
155155
</Midl>
156156
<ClCompile>
157157
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
158-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\MagicSoftware\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>$(SolutionDir)Externals\maya/ver-2009/include;../Shared;$(SolutionDir)xrEngine;$(SolutionDir)utils/xrQSlim/src/;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
159159
<PreprocessorDefinitions>NT_PLUGIN;_MAYA_EXPORT;_MAYA_PLUGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<StringPooling>true</StringPooling>
161161
<MinimalRebuild>false</MinimalRebuild>

‎src/utils/xrAI/xrAI.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</Midl>
7979
<ClCompile>
8080
<Optimization>Disabled</Optimization>
81-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
81+
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\FreeMagic\Include;$(SolutionDir)Externals\FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8282
<PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8383
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8484
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -126,7 +126,7 @@
126126
<OmitFramePointers>true</OmitFramePointers>
127127
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
128128
<WholeProgramOptimization>true</WholeProgramOptimization>
129-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
129+
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\FreeMagic\Include;$(SolutionDir)Externals\FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130130
<PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131131
<StringPooling>true</StringPooling>
132132
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -174,7 +174,7 @@
174174
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
175175
<OmitFramePointers>false</OmitFramePointers>
176176
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
177-
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;$(SolutionDir)Externals\FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
177+
<AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(SolutionDir)Externals\FreeMagic\Include;$(SolutionDir)Externals\FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
178178
<PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179179
<StringPooling>true</StringPooling>
180180
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

‎src/utils/xrLC/xrLC.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<OmitFramePointers>true</OmitFramePointers>
8585
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
8686
<WholeProgramOptimization>true</WholeProgramOptimization>
87-
<AdditionalIncludeDirectories>$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist\x32;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist\x32;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8888
<PreprocessorDefinitions>LEVEL_COMPILER;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<StringPooling>true</StringPooling>
9090
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -127,7 +127,7 @@
127127
</Midl>
128128
<ClCompile>
129129
<Optimization>Disabled</Optimization>
130-
<AdditionalIncludeDirectories>$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist\x32;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130+
<AdditionalIncludeDirectories>$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist\x32;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131131
<PreprocessorDefinitions>LEVEL_COMPILER;_USE_MATH_DEFINES;FORCE_NO_EXCEPTIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132132
<StringPooling>true</StringPooling>
133133
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +171,7 @@
171171
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
172172
<OmitFramePointers>false</OmitFramePointers>
173173
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
174-
<AdditionalIncludeDirectories>$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist\x32;$(SolutionDir)Externals\MagicSoftware\Sdk\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
174+
<AdditionalIncludeDirectories>$(SolutionDir)utils\xrQSlim\src;$(SolutionDir)Externals\FreeImage\Dist\x32;$(SolutionDir)Externals\FreeMagic\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
175175
<PreprocessorDefinitions>LEVEL_COMPILER;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
176176
<StringPooling>true</StringPooling>
177177
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

0 commit comments

Comments
 (0)