Bump version and try to fix error using the resource file after editi…

…ng from within VS
llde · Aug 31, 2023 · 969292f · 969292f
1 parent 8bb70af
commit 969292f
Show file tree

Hide file tree

Showing 10 changed files with 1,626 additions and 11 deletions.
diff --git a/obse/loader/loader.vcxproj b/obse/loader/loader.vcxproj
@@ -136,6 +136,7 @@
     <ClCompile Include="Updates.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\obse_common\resource.h" />
     <ClInclude Include="Inject.h" />
     <ClInclude Include="..\obse_common\obse_version.h" />
     <ClInclude Include="Updates.h" />

diff --git a/obse/obse/Utilities.h b/obse/obse/Utilities.h
@@ -460,6 +460,12 @@ __forceinline UInt32 ThisStdCall(UInt32 _f,void* _t,T1 a1,T2 a2,T3 a3,T4 a4,T5 a
 	return ((T*)_t->*u.m)(a1,a2,a3,a4,a5,a6);
 }
 
+template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+__forceinline UInt32 ThisStdCall(UInt32 _f, void* _t, T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7, T8 a8, T9 a9)
+{
+	class T {}; union { UInt32 x; UInt32(T::* m)(T1, T2, T3, T4, T5, T6, T7, T8, T9); } u = { _f };
+	return ((T*)_t->*u.m)(a1, a2, a3, a4, a5, a6, a7, a8, a9);
+}
 
 template <typename T1,typename T2,typename T3,typename T4,typename T5,typename T6, typename T7, typename T8, typename T9, typename T10>
 __forceinline UInt32 ThisStdCall(UInt32 _f,void* _t,T1 a1,T2 a2,T3 a3,T4 a4,T5 a5, T6 a6, T7 a7, T8 a8, T9 a9, T10 a10)

diff --git a/obse/obse/obse.vcxproj b/obse/obse/obse.vcxproj
@@ -100,6 +100,7 @@
       </BaseAddress>
       <ImportLibrary>$(OutDir)obse.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>$(ProjectDir)..\Detours\detours.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Message>Installing DLL...</Message>

diff --git a/obse/obse_common/obse_version.aps b/obse/obse_common/obse_version.aps
diff --git a/obse/obse_common/obse_version.h b/obse/obse_common/obse_version.h
@@ -3,9 +3,9 @@
 
 // these have to be macros so they can be used in the .rc
 #define OBSE_VERSION_INTEGER		22
-#define OBSE_VERSION_INTEGER_MINOR	9   //Avoid using revision 0  (at least 1 mod break for this)
+#define OBSE_VERSION_INTEGER_MINOR	10   //Avoid using revision 0  (at least 1 mod break for this)
 #define OBSE_VERSION_INTEGER_HOTIFX 0
-#define OBSE_VERSION_VERSTRING		"0, 22, 9, 0"
+#define OBSE_VERSION_VERSTRING		"0, 22, 10, 0"
 #define OBSE_VERSION_PADDEDSTRING	"0022"
 
 // build numbers are the month and date each build was made

diff --git a/obse/obse_common/obse_version.rc b/obse/obse_common/obse_version.rc
@@ -1,7 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
-#include "windows.h"
 /////////////////////////////////////////////////////////////////////////////
 // Italiano (Italia) resources
 
@@ -15,8 +14,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
 //
 
 1 VERSIONINFO
- FILEVERSION 0,22,8,0
- PRODUCTVERSION 0,22,8,0
+ FILEVERSION 0,22,10,0
+ PRODUCTVERSION 0,22,10,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -29,19 +28,19 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "041004b0"
         BEGIN
             VALUE "FileDescription", "A component of the Oblivion Script Extender"
-            VALUE "FileVersion", "0.22.9.0"
+            VALUE "FileVersion", "0.22.10.0"
             VALUE "InternalName", "obse"
             VALUE "LegalCopyright", "Copyright (C) 2006-2023"
             VALUE "ProductName", "obse"
-            VALUE "ProductVersion", "0.22.9.0"
+            VALUE "ProductVersion", "0.22.10.0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x410, 1200
     END
 END