Upgrade to SKSE 2.0.19 and SKSE VR 2.0.12 (#69)

* Upgrade to SKSE 2.0.19 and SKSE VR 2.0.12 (SE runtime stays the same - 1.5.97)
ryobg · Aug 25, 2020 · c783cb0 · c783cb0
1 parent 7038352
commit c783cb0
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 25 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 image: Visual Studio 2017
-version: '4.1.12.{build}'
+version: '4.1.13.{build}'
 platform: x64
 branches:
     only:

diff --git a/dep/skse64/skse/skse64/skse64.vcxproj b/dep/skse64/skse/skse64/skse64.vcxproj
@@ -52,11 +52,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)_1_5_80</TargetName>
+    <TargetName>$(ProjectName)_1_5_97</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)_1_5_80</TargetName>
+    <TargetName>$(ProjectName)_1_5_97</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -92,7 +92,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_USRDLL;SKSE64_EXPORTS;RUNTIME;RUNTIME_VERSION=0x01050490;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_USRDLL;SKSE64_EXPORTS;RUNTIME;RUNTIME_VERSION=0x01050610;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

diff --git a/dep/skse64/skse64.7z b/dep/skse64/skse64.7z
diff --git a/dep/sksevr/sksevr.7z b/dep/sksevr/sksevr.7z
diff --git a/dep/sksevr/sksevr/skse64/skseVR.vcxproj b/dep/sksevr/sksevr/skse64/skseVR.vcxproj
@@ -51,11 +51,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)_1_3_64</TargetName>
+    <TargetName>$(ProjectName)_1_4_15</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)_1_3_64</TargetName>
+    <TargetName>$(ProjectName)_1_4_15</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -64,7 +64,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_USRDLL;SKSE64_EXPORTS;RUNTIME_VERSION=0x01030401;RUNTIME;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USRDLL;SKSE64_EXPORTS;RUNTIME_VERSION=0x010400F1;RUNTIME;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -92,7 +92,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_USRDLL;SKSE64_EXPORTS;RUNTIME;RUNTIME_VERSION=0x01030401;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_USRDLL;SKSE64_EXPORTS;RUNTIME;RUNTIME_VERSION=0x010400F1;IS_VR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>common/IPrefix.h</ForcedIncludeFiles>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -138,6 +138,7 @@
     <ClCompile Include="GameThreads.cpp" />
     <ClCompile Include="GameTypes.cpp" />
     <ClCompile Include="GameUtilities.cpp" />
+    <ClCompile Include="GameVR.cpp" />
     <ClCompile Include="GlobalLocks.cpp" />
     <ClCompile Include="HashUtil.cpp" />
     <ClCompile Include="Hooks_Camera.cpp" />
@@ -156,11 +157,12 @@
     <ClCompile Include="Hooks_Scaleform.cpp" />
     <ClCompile Include="Hooks_Threads.cpp" />
     <ClCompile Include="Hooks_UI.cpp" />
+    <ClCompile Include="Hooks_VR.cpp" />
     <ClCompile Include="InputMap.cpp" />
+    <ClCompile Include="InternalVR.cpp" />
     <ClCompile Include="InternalSerialization.cpp" />
     <ClCompile Include="InternalTasks.cpp" />
     <ClCompile Include="NiAdditionalGeometryData.cpp" />
-    <ClCompile Include="NiAllocator.cpp" />
     <ClCompile Include="NiControllers.cpp" />
     <ClCompile Include="NiExtraData.cpp" />
     <ClCompile Include="NiGeometry.cpp" />
@@ -282,6 +284,7 @@
     <ClInclude Include="gamethreads.h" />
     <ClInclude Include="GameTypes.h" />
     <ClInclude Include="GameUtilities.h" />
+    <ClInclude Include="GameVR.h" />
     <ClInclude Include="GlobalLocks.h" />
     <ClInclude Include="HashUtil.h" />
     <ClInclude Include="Hooks_Camera.h" />
@@ -300,11 +303,12 @@
     <ClInclude Include="Hooks_Scaleform.h" />
     <ClInclude Include="Hooks_Threads.h" />
     <ClInclude Include="Hooks_UI.h" />
+    <ClInclude Include="Hooks_VR.h" />
     <ClInclude Include="InputMap.h" />
+    <ClInclude Include="InternalVR.h" />
     <ClInclude Include="InternalSerialization.h" />
     <ClInclude Include="InternalTasks.h" />
     <ClInclude Include="NiAdditionalGeometryData.h" />
-    <ClInclude Include="NiAllocator.h" />
     <ClInclude Include="NiControllers.h" />
     <ClInclude Include="NiExtraData.h" />
     <ClInclude Include="NiGeometry.h" />
@@ -320,6 +324,8 @@
     <ClInclude Include="NiTextures.h" />
     <ClInclude Include="NiTypes.h" />
     <ClInclude Include="ObScript.h" />
+    <ClInclude Include="openvr_1_0_12.h" />
+    <ClInclude Include="openvr_1_7_15.h" />
     <ClInclude Include="PapyrusActiveMagicEffect.h" />
     <ClInclude Include="PapyrusActor.h" />
     <ClInclude Include="PapyrusActorBase.h" />

diff --git a/dep/sksevr/sksevr/skse64/skseVR.vcxproj.filters b/dep/sksevr/sksevr/skse64/skseVR.vcxproj.filters
@@ -177,9 +177,6 @@
     <ClCompile Include="NiAdditionalGeometryData.cpp">
       <Filter>netimmerse</Filter>
     </ClCompile>
-    <ClCompile Include="NiAllocator.cpp">
-      <Filter>netimmerse</Filter>
-    </ClCompile>
     <ClCompile Include="NiControllers.cpp">
       <Filter>netimmerse</Filter>
     </ClCompile>
@@ -451,6 +448,15 @@
       <Filter>papyrus\vm</Filter>
     </ClCompile>
     <ClCompile Include="skse64.cpp" />
+    <ClCompile Include="GameVR.cpp">
+      <Filter>api</Filter>
+    </ClCompile>
+    <ClCompile Include="Hooks_VR.cpp">
+      <Filter>hooks</Filter>
+    </ClCompile>
+    <ClCompile Include="InternalVR.cpp">
+      <Filter>internal</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="GameAPI.h">
@@ -606,9 +612,6 @@
     <ClInclude Include="NiAdditionalGeometryData.h">
       <Filter>netimmerse</Filter>
     </ClInclude>
-    <ClInclude Include="NiAllocator.h">
-      <Filter>netimmerse</Filter>
-    </ClInclude>
     <ClInclude Include="NiControllers.h">
       <Filter>netimmerse</Filter>
     </ClInclude>
@@ -882,6 +885,21 @@
     <ClInclude Include="PapyrusVM.h">
       <Filter>papyrus\vm</Filter>
     </ClInclude>
+    <ClInclude Include="GameVR.h">
+      <Filter>api</Filter>
+    </ClInclude>
+    <ClInclude Include="openvr_1_0_12.h">
+      <Filter>internal</Filter>
+    </ClInclude>
+    <ClInclude Include="Hooks_VR.h">
+      <Filter>hooks</Filter>
+    </ClInclude>
+    <ClInclude Include="InternalVR.h">
+      <Filter>internal</Filter>
+    </ClInclude>
+    <ClInclude Include="openvr_1_7_15.h">
+      <Filter>internal</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="GameRTTI.inl">

diff --git a/src/JContainers/JContainers.vcxproj b/src/JContainers/JContainers.vcxproj
@@ -260,7 +260,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)dep\boost\boost_lib\lib;$(SolutionDir)$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_80.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_97.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent />
     <Bscmake />
@@ -297,7 +297,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)dep\boost\boost_lib\lib;$(SolutionDir)$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\Release</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_3_64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_4_15.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent />
     <Bscmake />
@@ -409,7 +409,7 @@
       <SubSystem>Console</SubSystem>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_80.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_97.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent />
@@ -452,7 +452,7 @@
       <SubSystem>Console</SubSystem>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_3_64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_4_15.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
     <PostBuildEvent />

diff --git a/src/JContainers/src/collections/lua_native_funcs.hpp b/src/JContainers/src/collections/lua_native_funcs.hpp
@@ -113,6 +113,7 @@ namespace lua { namespace api {
         case item_type::form:
             itm = collections::make_weak_form_id((FormId)v->form.___id, context);
             break;
+        // @see issue #40
         case item_type::integer:
             itm = v->integer;
             break;

diff --git a/src/JContainers/src/jcontainers_constants.h b/src/JContainers/src/jcontainers_constants.h
@@ -6,7 +6,7 @@ namespace collections {
 
 #   define JC_API_VERSION           4
 #   define JC_FEATURE_VERSION       1
-#   define JC_PATCH_VERSION         12
+#   define JC_PATCH_VERSION         13
 
 #   define JC_FILE_VERSION          JC_API_VERSION, JC_FEATURE_VERSION, JC_PATCH_VERSION, 0
 

diff --git a/src/api_usage_example/api_usage_example.vcxproj b/src/api_usage_example/api_usage_example.vcxproj
@@ -197,7 +197,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_80.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_97.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)\dep\boost\boost_lib\lib;$(SolutionDir)$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -215,7 +215,7 @@
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_3_64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_4_15.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)\dep\boost\boost_lib\lib;$(SolutionDir)$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\Debug</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -268,7 +268,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_80.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common64.lib;skse64_common.lib;skse64_1_5_97.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)\dep\boost\boost_lib\lib;$(SolutionDir)$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -287,7 +287,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_3_64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>commonvr.lib;sksevr_common.lib;sksevr_1_4_15.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)\dep\boost\boost_lib\lib;$(SolutionDir)$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\Release</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>