Skip to content
Snippets Groups Projects
Commit 40ef2f49 authored by Tazpn's avatar Tazpn
Browse files

max: Update build for VS 2008 and remove havok dependency in favor of nifmopp.dll.

parent cbf812cb
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="Max_Version_2009"
InheritedPropertySheets="..\..\User_Settings.vsprops"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="USE_BIPED"
/>
<Tool
Name="VCPreBuildEventTool"
Description="Checking Environment Variables ..."
CommandLine="IF NOT EXIST &quot;$(MaxInstallDir)&quot; (&#x0D;&#x0A; echo :&#x0D;&#x0A; echo : The variable MAXINSTALLPATH2009 is not defined.&#x0D;&#x0A; echo : Set environment variable or edit User_Settings.vsprops to correct. &#x0D;&#x0A; echo :&#x0D;&#x0A; EXIT 2&#x0D;&#x0A;) else (&#x0D;&#x0A; echo : Using MAXINSTALLPATH2009=%MAXINSTALLPATH2009%&#x0D;&#x0A;)&#x0D;&#x0A;"
/>
<UserMacro Name="MaxInstallDir" Value="$(MAXINSTALLPATH2009)\" PerformEnvironmentSet="true"/>
</VisualStudioPropertySheet>
This diff is collapsed.
This diff is collapsed.
...@@ -13,16 +13,6 @@ ...@@ -13,16 +13,6 @@
#include <notify.h> #include <notify.h>
#ifdef USES_HAVOK
//
// Math and base include
#include <Common/Base/hkBase.h>
#include <Common/Base/System/hkBaseSystem.h>
#include <Common/Base/Memory/hkThreadMemory.h>
#include <Common/Base/Memory/Memory/Pool/hkPoolMemory.h>
#include <Common/Base/System/Error/hkDefaultError.h>
#endif
extern void DoNotifyNodeHide(void *param, NotifyInfo *info); extern void DoNotifyNodeHide(void *param, NotifyInfo *info);
extern void DoNotifyNodeUnHide(void *param, NotifyInfo *info); extern void DoNotifyNodeUnHide(void *param, NotifyInfo *info);
...@@ -41,9 +31,6 @@ extern ClassDesc* GetDDSLibClassDesc(); ...@@ -41,9 +31,6 @@ extern ClassDesc* GetDDSLibClassDesc();
extern ClassDesc2* GetbhkListObjDesc(); extern ClassDesc2* GetbhkListObjDesc();
extern ClassDesc2* GetbhkProxyObjDesc(); extern ClassDesc2* GetbhkProxyObjDesc();
static void InitializeHavok();
static void CloseHavok();
enum ClassDescType enum ClassDescType
{ {
CD_Import, CD_Import,
...@@ -80,12 +67,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved) ...@@ -80,12 +67,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
InitCommonControls(); // Initialize Win95 controls InitCommonControls(); // Initialize Win95 controls
RegisterNotification(DoNotifyNodeHide, NULL, NOTIFY_NODE_HIDE); RegisterNotification(DoNotifyNodeHide, NULL, NOTIFY_NODE_HIDE);
RegisterNotification(DoNotifyNodeUnHide, NULL, NOTIFY_NODE_UNHIDE); RegisterNotification(DoNotifyNodeUnHide, NULL, NOTIFY_NODE_UNHIDE);
InitializeHavok();
} }
if (fdwReason == DLL_PROCESS_ATTACH) if (fdwReason == DLL_PROCESS_ATTACH)
InitializeLibSettings(); InitializeLibSettings();
if (fdwReason == DLL_PROCESS_DETACH)
CloseHavok();
return (TRUE); return (TRUE);
} }
...@@ -280,53 +264,3 @@ static void DoNotifyNodeUnHide(void *param, NotifyInfo *info) ...@@ -280,53 +264,3 @@ static void DoNotifyNodeUnHide(void *param, NotifyInfo *info)
} }
} }
} }
#ifdef USES_HAVOK
static hkThreadMemory* threadMemory = NULL;
static char* stackBuffer = NULL;
static void HK_CALL errorReport(const char* msg, void*)
{
OutputDebugString(msg);
}
static void InitializeHavok()
{
// Initialize the base system including our memory system
hkPoolMemory* memoryManager = new hkPoolMemory();
threadMemory = new hkThreadMemory(memoryManager, 16);
hkBaseSystem::init( memoryManager, threadMemory, errorReport );
memoryManager->removeReference();
// We now initialize the stack area to 100k (fast temporary memory to be used by the engine).
{
int stackSize = 0x100000;
stackBuffer = hkAllocate<char>( stackSize, HK_MEMORY_CLASS_BASE);
hkThreadMemory::getInstance().setStackArea( stackBuffer, stackSize);
}
}
static void CloseHavok()
{
// Deallocate stack area
if (threadMemory)
{
threadMemory->setStackArea(0, 0);
hkDeallocate(stackBuffer);
threadMemory->removeReference();
threadMemory = NULL;
stackBuffer = NULL;
}
// Quit base system
hkBaseSystem::quit();
}
#else
static void InitializeHavok()
{
}
static void CloseHavok()
{
}
#endif
This diff is collapsed.
This diff is collapsed.
...@@ -66,8 +66,8 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -66,8 +66,8 @@ POSSIBILITY OF SUCH DAMAGE.
<UserMacro Name="MAXINSTALLPATH70" Value="$(SystemDrive)\3dsmax7" PerformEnvironmentSet="true"/> <UserMacro Name="MAXINSTALLPATH70" Value="$(SystemDrive)\3dsmax7" PerformEnvironmentSet="true"/>
<UserMacro Name="MAXINSTALLPATH80" Value="$(SystemDrive)\3dsmax8" PerformEnvironmentSet="true"/> <UserMacro Name="MAXINSTALLPATH80" Value="$(SystemDrive)\3dsmax8" PerformEnvironmentSet="true"/>
<UserMacro Name="MAXINSTALLPATH90" Value="$(ProgramFiles)\AutoDesk\3ds Max 9" PerformEnvironmentSet="true"/> <UserMacro Name="MAXINSTALLPATH90" Value="$(ProgramFiles)\AutoDesk\3ds Max 9" PerformEnvironmentSet="true"/>
<UserMacro Name="MAXINSTALLPATH100" Value="$(ProgramFiles)\AutoDesk\3ds Max 10" PerformEnvironmentSet="true"/>
<UserMacro Name="MAXINSTALLPATH2008" Value="$(ProgramFiles)\AutoDesk\3ds Max 2008" PerformEnvironmentSet="true"/> <UserMacro Name="MAXINSTALLPATH2008" Value="$(ProgramFiles)\AutoDesk\3ds Max 2008" PerformEnvironmentSet="true"/>
<UserMacro Name="MAXINSTALLPATH2009" Value="$(ProgramFiles)\AutoDesk\3ds Max 2009" PerformEnvironmentSet="true"/>
--> -->
</VisualStudioPropertySheet> </VisualStudioPropertySheet>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment