Master update 6

Fixed logging for non-unicode builds. Fixed crash caused by dialog for some versions.
PredatorCZ · Jul 8, 2019 · b8fecf5 · b8fecf5
1 parent 56a6f1c
commit b8fecf5
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 17 deletions.
diff --git a/3rd_party/HavokLib b/3rd_party/HavokLib
diff --git a/HavokMax.sln b/HavokMax.sln
@@ -34,6 +34,8 @@ Global
 		2019|x86 = 2019|x86
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release_Char|x64 = Release_Char|x64
+		Release_Char|x86 = Release_Char|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
@@ -82,21 +84,25 @@ Global
 		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Debug|x64.Build.0 = 2017|x64
 		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Debug|x86.ActiveCfg = 2017|x64
 		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Debug|x86.Build.0 = 2017|x64
+		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Release_Char|x64.ActiveCfg = Release_Char|x64
+		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Release_Char|x64.Build.0 = Release_Char|x64
+		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Release_Char|x86.ActiveCfg = Release_Char|Win32
+		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Release_Char|x86.Build.0 = Release_Char|Win32
 		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Release|x64.ActiveCfg = 2017|x64
 		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Release|x64.Build.0 = 2017|x64
 		{6671F0BA-6FB8-4F35-8392-0676D05113A8}.Release|x86.ActiveCfg = 2017|x64
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x64.ActiveCfg = Release|x64
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x64.Build.0 = Release|x64
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x86.ActiveCfg = Release|Win32
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x86.Build.0 = Release|Win32
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x64.ActiveCfg = Release|x64
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x64.Build.0 = Release|x64
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x86.ActiveCfg = Release|Win32
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x86.Build.0 = Release|Win32
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x64.ActiveCfg = Release|x64
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x64.Build.0 = Release|x64
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x86.ActiveCfg = Release|Win32
-		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x86.Build.0 = Release|Win32
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x64.ActiveCfg = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x64.Build.0 = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x86.ActiveCfg = Release_Char|Win32
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2010|x86.Build.0 = Release_Char|Win32
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x64.ActiveCfg = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x64.Build.0 = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x86.ActiveCfg = Release_Char|Win32
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2011|x86.Build.0 = Release_Char|Win32
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x64.ActiveCfg = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x64.Build.0 = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x86.ActiveCfg = Release_Char|Win32
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2012|x86.Build.0 = Release_Char|Win32
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2013|x64.ActiveCfg = Release|x64
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2013|x64.Build.0 = Release|x64
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.2013|x86.ActiveCfg = Release|Win32
@@ -129,6 +135,10 @@ Global
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Debug|x64.Build.0 = Release|x64
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Debug|x86.ActiveCfg = Release|x64
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Debug|x86.Build.0 = Release|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Release_Char|x64.ActiveCfg = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Release_Char|x64.Build.0 = Release_Char|x64
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Release_Char|x86.ActiveCfg = Release_Char|Win32
+		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Release_Char|x86.Build.0 = Release_Char|Win32
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Release|x64.ActiveCfg = Release|x64
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Release|x64.Build.0 = Release|x64
 		{FFCA4C01-B4D8-46B2-8224-8D210C11B3CD}.Release|x86.ActiveCfg = Release|x64

diff --git a/HavokMax.vcxproj b/HavokMax.vcxproj
@@ -57,6 +57,14 @@
       <Configuration>2018</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_Char|Win32">
+      <Configuration>Release_Char</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_Char|x64">
+      <Configuration>Release_Char</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="3rd_party\HavokLib\3rd_party\PreCore\MAXex\win\About.rc" />
@@ -110,7 +118,13 @@
     <CharacterSet Condition="!('$(Configuration)'=='2010' Or '$(Configuration)'=='2011' Or '$(Configuration)'=='2012')">Unicode</CharacterSet>
     <OutDir>Bin\$(Platform)_$(Configuration)\</OutDir>
     <IntDir>ObjDump\$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup> 
+  <PropertyGroup Label="Globals" Condition="'$(CharacterSet)'=='NotSet'">
+    <MAXLibLinkNameSuffix>Release_Char</MAXLibLinkNameSuffix>
   </PropertyGroup>
+  <PropertyGroup Label="Globals" Condition="'$(CharacterSet)'=='Unicode'">
+    <MAXLibLinkNameSuffix>Release</MAXLibLinkNameSuffix>
+  </PropertyGroup>   
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -133,7 +147,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>3rd_party/HavokLib/lib/$(Platform)_Release;$(MaxSDKLibs);$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>3rd_party/HavokLib/lib/$(Platform)_$(MAXLibLinkNameSuffix);$(MaxSDKLibs);$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>gdiplus.lib;HavokLib.lib;bmm.lib;core.lib;flt.lib;mesh.lib;maxutil.lib;maxscrpt.lib;paramblk2.lib;geom.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>

diff --git a/src/HavokMax.cpp b/src/HavokMax.cpp
@@ -538,7 +538,7 @@ INT_PTR CALLBACK DialogCallbacksMain(HWND hWnd, UINT message, WPARAM wParam, LPA
 		break;
 
 		default:
-			return imp->DlgCommandCallBack(wParam, lParam);
+			return imp ? imp->DlgCommandCallBack(wParam, lParam) : FALSE;
 		}
 
 	case CC_SPINNER_CHANGE:

diff --git a/src/HavokMax.h b/src/HavokMax.h
@@ -33,8 +33,8 @@
 #include <vector>
 #include "HavokXMLApi.hpp"
 
-#define HAVOKMAX_VERSION 1.7
-#define HAVOKMAX_VERSIONINT 170
+#define HAVOKMAX_VERSION 1.8
+#define HAVOKMAX_VERSIONINT 180
 
 extern TCHAR *GetString(int id);
 extern HINSTANCE hInstance;