Skip to content

Commit ee5e64f

Browse files
committed
Added API as subproject to facilitate use of the API from other plugins
1 parent 7a20b3a commit ee5e64f

File tree

4 files changed

+197
-61
lines changed

4 files changed

+197
-61
lines changed

SkyrimVRTools.sln

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27428.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skyrimvrtools", "src\SkyrimVRTools.vcxproj", "{9D903497-BB27-4C98-801C-E70FDF7E41FA}"
77
EndProject
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skyrimvrtools_api", "src\api\SkyrimVRToolsAPI.vcxproj", "{849411C0-FC23-4819-A0D5-429A4E6D8A51}"
9+
EndProject
810
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_vc14", "src\sksevr\common\common_vc14.vcxproj", "{472E19AB-DEF0-42DF-819B-18722E8DC822}"
911
EndProject
1012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skse64", "src\sksevr\skse64\skse64.vcxproj", "{639411C0-FC23-4819-A0C5-429A4E5D8A51}"
@@ -27,6 +29,15 @@ Global
2729
{9D903497-BB27-4C98-801C-E70FDF7E41FA}.Release|x64.Build.0 = Release|x64
2830
{9D903497-BB27-4C98-801C-E70FDF7E41FA}.Release-StaticLib|x64.ActiveCfg = Release|x64
2931
{9D903497-BB27-4C98-801C-E70FDF7E41FA}.Release-StaticLib|x64.Build.0 = Release|x64
32+
#Dependency API Project
33+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Debug|x64.ActiveCfg = Debug-StaticLib|x64
34+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Debug|x64.Build.0 = Debug-StaticLib|x64
35+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Debug-StaticLib|x64.ActiveCfg = Debug-StaticLib|x64
36+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Debug-StaticLib|x64.Build.0 = Debug-StaticLib|x64
37+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Release|x64.ActiveCfg = Release-StaticLib|x64
38+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Release|x64.Build.0 = Release-StaticLib|x64
39+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Release-StaticLib|x64.ActiveCfg = Release-StaticLib|x64
40+
{849411C0-FC23-4819-A0D5-429A4E6D8A51}.Release-StaticLib|x64.Build.0 = Release-StaticLib|x64
3041
#Dependency SKSE Projects
3142
{472E19AB-DEF0-42DF-819B-18722E8DC822}.Debug|x64.ActiveCfg = Debug|x64
3243
{472E19AB-DEF0-42DF-819B-18722E8DC822}.Debug|x64.Build.0 = Debug|x64

src/SkyrimVRTools.vcxproj

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@
112112
</PostBuildEvent>
113113
</ItemDefinitionGroup>
114114
<ItemGroup>
115-
<ClCompile Include="api\collisions\LocalOverlapObject.cpp" />
116-
<ClCompile Include="api\collisions\Sphere.cpp" />
117-
<ClCompile Include="api\PapyrusVRTypes.cpp" />
118-
<ClCompile Include="api\utils\OpenVRUtils.cpp" />
119115
<ClCompile Include="DirUtils.cpp" />
120116
<ClCompile Include="hooks\HookVRCompositor.cpp" />
121117
<ClCompile Include="hooks\HookVRSystem.cpp" />
@@ -126,15 +122,6 @@
126122
<ClCompile Include="VRManager.cpp" />
127123
</ItemGroup>
128124
<ItemGroup>
129-
<ClInclude Include="api\collisions\IShape.h" />
130-
<ClInclude Include="api\collisions\LocalOverlapObject.h" />
131-
<ClInclude Include="api\collisions\Sphere.h" />
132-
<ClInclude Include="api\OpenVRTypes.h" />
133-
<ClInclude Include="api\PapyrusVRAPI.h" />
134-
<ClInclude Include="api\PapyrusVRTypes.h" />
135-
<ClInclude Include="api\utils\OpenVRUtils.h" />
136-
<ClInclude Include="api\VRManagerAPI.h" />
137-
<ClInclude Include="api\VRHookAPI.h" />
138125
<ClInclude Include="DirUtils.h" />
139126
<ClInclude Include="EventHandling.h" />
140127
<ClInclude Include="hooks\IHookInterfaceFactory.h" />
@@ -155,6 +142,9 @@
155142
<ProjectReference Include="sksevr\skse64\skse64.vcxproj">
156143
<Project>{639411c0-fc23-4819-a0c5-429a4e5d8a51}</Project>
157144
</ProjectReference>
145+
<ProjectReference Include="api\SkyrimVRToolsAPI.vcxproj">
146+
<Project>{849411C0-FC23-4819-A0D5-429A4E6D8A51}</Project>
147+
</ProjectReference>
158148
</ItemGroup>
159149
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
160150
<ImportGroup Label="ExtensionTargets">

src/SkyrimVRTools.vcxproj.filters

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@
1212
<Filter Include="hook">
1313
<UniqueIdentifier>{92868268-59b1-4f6f-9da7-156dd5081e2d}</UniqueIdentifier>
1414
</Filter>
15-
<Filter Include="api">
16-
<UniqueIdentifier>{a1e35c98-c69d-43b2-bcdb-09c07073f95d}</UniqueIdentifier>
17-
</Filter>
18-
<Filter Include="api\collisions">
19-
<UniqueIdentifier>{966a1e43-6777-4b6b-b5e0-8217cdf1d88d}</UniqueIdentifier>
20-
</Filter>
21-
<Filter Include="api\utils">
22-
<UniqueIdentifier>{b09e5f53-1dd3-4efc-82d8-89748c93ae8b}</UniqueIdentifier>
23-
</Filter>
2415
</ItemGroup>
2516
<ItemGroup>
2617
<ClCompile Include="main.cpp">
@@ -47,18 +38,6 @@
4738
<ClCompile Include="DirUtils.cpp">
4839
<Filter>Source Files</Filter>
4940
</ClCompile>
50-
<ClCompile Include="api\PapyrusVRTypes.cpp">
51-
<Filter>api</Filter>
52-
</ClCompile>
53-
<ClCompile Include="api\utils\OpenVRUtils.cpp">
54-
<Filter>api\utils</Filter>
55-
</ClCompile>
56-
<ClCompile Include="api\collisions\LocalOverlapObject.cpp">
57-
<Filter>api\collisions</Filter>
58-
</ClCompile>
59-
<ClCompile Include="api\collisions\Sphere.cpp">
60-
<Filter>api\collisions</Filter>
61-
</ClCompile>
6241
</ItemGroup>
6342
<ItemGroup>
6443
<None Include="exports.def">
@@ -93,32 +72,5 @@
9372
<ClInclude Include="EventHandling.h">
9473
<Filter>Header Files</Filter>
9574
</ClInclude>
96-
<ClInclude Include="api\OpenVRTypes.h">
97-
<Filter>api</Filter>
98-
</ClInclude>
99-
<ClInclude Include="api\PapyrusVRAPI.h">
100-
<Filter>api</Filter>
101-
</ClInclude>
102-
<ClInclude Include="api\PapyrusVRTypes.h">
103-
<Filter>api</Filter>
104-
</ClInclude>
105-
<ClInclude Include="api\VRManagerAPI.h">
106-
<Filter>api</Filter>
107-
</ClInclude>
108-
<ClInclude Include="api\VRHookAPI.h">
109-
<Filter>api</Filter>
110-
</ClInclude>
111-
<ClInclude Include="api\utils\OpenVRUtils.h">
112-
<Filter>api\utils</Filter>
113-
</ClInclude>
114-
<ClInclude Include="api\collisions\IShape.h">
115-
<Filter>api\collisions</Filter>
116-
</ClInclude>
117-
<ClInclude Include="api\collisions\LocalOverlapObject.h">
118-
<Filter>api\collisions</Filter>
119-
</ClInclude>
120-
<ClInclude Include="api\collisions\Sphere.h">
121-
<Filter>api\collisions</Filter>
122-
</ClInclude>
12375
</ItemGroup>
12476
</Project>

src/api/SkyrimVRToolsAPI.vcxproj

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug-StaticLib|x64">
5+
<Configuration>Debug-StaticLib</Configuration>
6+
<Platform>x64</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release-StaticLib|x64">
13+
<Configuration>Release-StaticLib</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{849411C0-FC23-4819-A0D5-429A4E6D8A51}</ProjectGuid>
23+
<RootNamespace>skse64</RootNamespace>
24+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
25+
<SccProjectName>
26+
</SccProjectName>
27+
<SccAuxPath>
28+
</SccAuxPath>
29+
<SccLocalPath>
30+
</SccLocalPath>
31+
<SccProvider>
32+
</SccProvider>
33+
</PropertyGroup>
34+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
36+
<ConfigurationType>DynamicLibrary</ConfigurationType>
37+
<UseDebugLibraries>true</UseDebugLibraries>
38+
<PlatformToolset>v140</PlatformToolset>
39+
<CharacterSet>MultiByte</CharacterSet>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-StaticLib|x64'" Label="Configuration">
42+
<ConfigurationType>StaticLibrary</ConfigurationType>
43+
<UseDebugLibraries>true</UseDebugLibraries>
44+
<PlatformToolset>v141</PlatformToolset>
45+
<CharacterSet>MultiByte</CharacterSet>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<ConfigurationType>DynamicLibrary</ConfigurationType>
49+
<UseDebugLibraries>false</UseDebugLibraries>
50+
<PlatformToolset>v140</PlatformToolset>
51+
<WholeProgramOptimization>true</WholeProgramOptimization>
52+
<CharacterSet>MultiByte</CharacterSet>
53+
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-StaticLib|x64'" Label="Configuration">
55+
<ConfigurationType>StaticLibrary</ConfigurationType>
56+
<UseDebugLibraries>false</UseDebugLibraries>
57+
<PlatformToolset>v141</PlatformToolset>
58+
<WholeProgramOptimization>true</WholeProgramOptimization>
59+
<CharacterSet>MultiByte</CharacterSet>
60+
</PropertyGroup>
61+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
62+
<ImportGroup Label="ExtensionSettings">
63+
</ImportGroup>
64+
<ImportGroup Label="Shared">
65+
</ImportGroup>
66+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
</ImportGroup>
69+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-StaticLib|x64'" Label="PropertySheets">
70+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
</ImportGroup>
72+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
73+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
74+
</ImportGroup>
75+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-StaticLib|x64'" Label="PropertySheets">
76+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
77+
</ImportGroup>
78+
<PropertyGroup Label="UserMacros" />
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
80+
<TargetName>skyrimvrtools_api</TargetName>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-StaticLib|x64'">
83+
<TargetName>skyrimvrtools_api</TargetName>
84+
</PropertyGroup>
85+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
86+
<TargetName>skyrimvrtools_api</TargetName>
87+
</PropertyGroup>
88+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-StaticLib|x64'">
89+
<TargetName>skyrimvrtools_api</TargetName>
90+
</PropertyGroup>
91+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
92+
<ClCompile>
93+
<WarningLevel>Level3</WarningLevel>
94+
<Optimization>Disabled</Optimization>
95+
<SDLCheck>false</SDLCheck>
96+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src;$(SolutionDir)src\openvr;$(SolutionDir)src\sksevr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97+
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;RUNTIME_VERSION=0x010400F1;RUNTIME;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
99+
<ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
100+
</ClCompile>
101+
<Link>
102+
<SubSystem>Windows</SubSystem>
103+
</Link>
104+
</ItemDefinitionGroup>
105+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-StaticLib|x64'">
106+
<ClCompile>
107+
<WarningLevel>Level3</WarningLevel>
108+
<Optimization>Disabled</Optimization>
109+
<SDLCheck>false</SDLCheck>
110+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src;$(SolutionDir)src\openvr;$(SolutionDir)src\sksevr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
111+
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;RUNTIME_VERSION=0x010400F1;RUNTIME;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
113+
<ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
114+
</ClCompile>
115+
<Link>
116+
<SubSystem>Windows</SubSystem>
117+
</Link>
118+
</ItemDefinitionGroup>
119+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
120+
<ClCompile>
121+
<WarningLevel>Level3</WarningLevel>
122+
<Optimization>MaxSpeed</Optimization>
123+
<FunctionLevelLinking>true</FunctionLevelLinking>
124+
<IntrinsicFunctions>true</IntrinsicFunctions>
125+
<SDLCheck>false</SDLCheck>
126+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src;$(SolutionDir)src\openvr;$(SolutionDir)src\sksevr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;RUNTIME;RUNTIME_VERSION=0x010400F1;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
129+
<ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
130+
</ClCompile>
131+
<Link>
132+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
133+
<OptimizeReferences>true</OptimizeReferences>
134+
<SubSystem>Windows</SubSystem>
135+
</Link>
136+
</ItemDefinitionGroup>
137+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-StaticLib|x64'">
138+
<ClCompile>
139+
<WarningLevel>Level3</WarningLevel>
140+
<Optimization>MaxSpeed</Optimization>
141+
<FunctionLevelLinking>true</FunctionLevelLinking>
142+
<IntrinsicFunctions>true</IntrinsicFunctions>
143+
<SDLCheck>false</SDLCheck>
144+
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)src;$(SolutionDir)src\openvr;$(SolutionDir)src\sksevr;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
145+
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;RUNTIME;RUNTIME_VERSION=0x010400F1;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
147+
<ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
148+
</ClCompile>
149+
<Link>
150+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
151+
<OptimizeReferences>true</OptimizeReferences>
152+
<SubSystem>Windows</SubSystem>
153+
</Link>
154+
</ItemDefinitionGroup>
155+
<ItemGroup>
156+
<ClCompile Include="collisions\LocalOverlapObject.cpp" />
157+
<ClCompile Include="collisions\Sphere.cpp" />
158+
<ClCompile Include="PapyrusVRTypes.cpp" />
159+
<ClCompile Include="utils\OpenVRUtils.cpp" />
160+
</ItemGroup>
161+
<ItemGroup>
162+
<ClInclude Include="collisions\IShape.h" />
163+
<ClInclude Include="collisions\LocalOverlapObject.h" />
164+
<ClInclude Include="collisions\Sphere.h" />
165+
<ClInclude Include="OpenVRTypes.h" />
166+
<ClInclude Include="PapyrusVRAPI.h" />
167+
<ClInclude Include="PapyrusVRTypes.h" />
168+
<ClInclude Include="utils\OpenVRUtils.h" />
169+
<ClInclude Include="VRManagerAPI.h" />
170+
<ClInclude Include="VRHookAPI.h" />
171+
</ItemGroup>
172+
<ItemGroup>
173+
<ProjectReference Include="..\sksevr\common\common_vc14.vcxproj">
174+
<Project>{472e19ab-def0-42df-819b-18722e8dc822}</Project>
175+
</ProjectReference>
176+
<ProjectReference Include="..\sksevr\skse64\skse64.vcxproj">
177+
<Project>{639411c0-fc23-4819-a0c5-429a4e5d8a51}</Project>
178+
</ProjectReference>
179+
</ItemGroup>
180+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
181+
<ImportGroup Label="ExtensionTargets">
182+
</ImportGroup>
183+
</Project>

0 commit comments

Comments
 (0)