Skip to content
Snippets Groups Projects
Commit 7a37b016 authored by Tazpn's avatar Tazpn
Browse files

max: Fixes for X64 builds.

parent 869938d2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Build/NifPlugins_VC2008.vcproj
+ 32
− 0
View file @ 7a37b016
...@@ -9910,6 +9910,14 @@ ...@@ -9910,6 +9910,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug - Max 2008|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release - Max 2008|Win32" Name="Release - Max 2008|Win32"
> >
...@@ -9918,6 +9926,14 @@ ...@@ -9918,6 +9926,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release - Max 2008|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug - Max 2009|Win32" Name="Debug - Max 2009|Win32"
> >
...@@ -9926,6 +9942,14 @@ ...@@ -9926,6 +9942,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Debug - Max 2009|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release - Max 2009|Win32" Name="Release - Max 2009|Win32"
> >
...@@ -9934,6 +9958,14 @@ ...@@ -9934,6 +9958,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release - Max 2009|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\NifPlugins\pch.h" RelativePath="..\NifPlugins\pch.h"
......
Build/Sheets/Max_System_Default.vsprops
+ 0
− 1
View file @ 7a37b016
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib core.lib geom.lib gfx.lib mesh.lib maxutil.lib maxscrpt.lib paramblk2.lib bmm.lib mnmath.lib" AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib shlwapi.lib core.lib geom.lib gfx.lib mesh.lib maxutil.lib maxscrpt.lib paramblk2.lib bmm.lib mnmath.lib"
SuppressStartupBanner="true" SuppressStartupBanner="true"
ModuleDefinitionFile="$(ProjectDir)..\NifPlugins\NifPlugins.def" ModuleDefinitionFile="$(ProjectDir)..\NifPlugins\NifPlugins.def"
......
Build/Sheets/Max_System_Win32.vsprops
+ 2
− 1
View file @ 7a37b016
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="Max_System_Win32" Name="Max_System_Win32"
InheritedPropertySheets=".\Max_System_Default.vsprops;.\Niflib_Settings.vsprops;.\Havok_Settings.vsprops" InheritedPropertySheets=".\Max_System_Default.vsprops;.\Niflib_Settings.vsprops"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalLibraryDirectories="$(MaxSDKDir)\lib" AdditionalLibraryDirectories="$(MaxSDKDir)\lib"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>
Build/Sheets/Max_System_x64.vsprops
+ 4
− 1
View file @ 7a37b016
...@@ -3,15 +3,18 @@ ...@@ -3,15 +3,18 @@
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="Max_System_x64" Name="Max_System_x64"
OutputDirectory="$(SolutionDir)Staging\$(ConfigurationName) - $(PlatformName)\"
IntermediateDirectory="$(SolutionDir)Temp\$(ProjectName)\$(ConfigurationName) - $(PlatformName)\"
InheritedPropertySheets=".\Max_System_Default.vsprops;.\Niflib_Settings.vsprops" InheritedPropertySheets=".\Max_System_Default.vsprops;.\Niflib_Settings.vsprops"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32" PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0500"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalLibraryDirectories="$(MaxSDKDir)\x64\lib" AdditionalLibraryDirectories="$(MaxSDKDir)\x64\lib"
AdditionalOptions="/MACHINE:X64"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>
MaxNifTools.iss
+ 18
− 5
View file @ 7a37b016
...@@ -36,9 +36,11 @@ Name: "max6"; Description: "3ds Max 6"; Types: custom; ...@@ -36,9 +36,11 @@ Name: "max6"; Description: "3ds Max 6"; Types: custom;
Name: "max7"; Description: "3ds Max 7"; Types: custom; Name: "max7"; Description: "3ds Max 7"; Types: custom;
Name: "max8"; Description: "3ds Max 8"; Types: custom; Name: "max8"; Description: "3ds Max 8"; Types: custom;
Name: "max9"; Description: "3ds Max 9 (Win32)"; Types: custom; Name: "max9"; Description: "3ds Max 9 (Win32)"; Types: custom;
;Name: "max9x64"; Description: "3ds Max 9 (x64)"; Types: custom; Name: "max9x64"; Description: "3ds Max 9 (x64)"; Types: custom;
Name: "max10"; Description: "3ds Max 2008 (Win32)"; Types: custom; Name: "max10"; Description: "3ds Max 2008 (Win32)"; Types: custom;
Name: "max10x64"; Description: "3ds Max 2008 (x64)"; Types: custom;
Name: "max11"; Description: "3ds Max 2009 (Win32)"; Types: custom; Name: "max11"; Description: "3ds Max 2009 (Win32)"; Types: custom;
Name: "max11x64"; Description: "3ds Max 2009 (x64)"; Types: custom;
;Name: "src"; Description: "Program Source"; ;Name: "src"; Description: "Program Source";
[Files] [Files]
...@@ -83,10 +85,10 @@ Source: "Staging\Release - Max 9\MaxNifTools.ini"; DestDir: "{code:InstallPath|m ...@@ -83,10 +85,10 @@ Source: "Staging\Release - Max 9\MaxNifTools.ini"; DestDir: "{code:InstallPath|m
Source: "Staging\Release - Max 9\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\9 - 32bit\enu\plugcfg"; Components: "max9"; Flags: ignoreversion; Source: "Staging\Release - Max 9\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\9 - 32bit\enu\plugcfg"; Components: "max9"; Flags: ignoreversion;
Source: "Staging\NifMopp.dll"; DestDir: "{code:InstallPath|max9}{\}plugins"; Components: "max9"; Flags: ignoreversion; Source: "Staging\NifMopp.dll"; DestDir: "{code:InstallPath|max9}{\}plugins"; Components: "max9"; Flags: ignoreversion;
; Source: "Staging\Release - Max 9 - x64\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max9x64}"; Components: "max9x64"; Flags: isreadme ignoreversion; Source: "Staging\Release - Max 9 - x64\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max9x64}"; Components: "max9x64"; Flags: isreadme ignoreversion;
; Source: "Staging\Release - Max 9 - x64\NifPlugins.dlu"; DestDir: "{code:InstallPath|max9x64}{\}plugins"; Components: "max9x64"; Flags: ignoreversion; Source: "Staging\Release - Max 9 - x64\NifPlugins.dlu"; DestDir: "{code:InstallPath|max9x64}{\}plugins"; Components: "max9x64"; Flags: ignoreversion;
; Source: "Staging\Release - Max 9 - x64\MaxNifTools.ini"; DestDir: "{code:InstallPath|max9x64}{\}plugcfg"; Components: "max9x64"; Flags: ignoreversion; Source: "Staging\Release - Max 9 - x64\MaxNifTools.ini"; DestDir: "{code:InstallPath|max9x64}{\}plugcfg"; Components: "max9x64"; Flags: ignoreversion;
; Source: "Staging\Release - Max 9 - x64\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\9 - 64bit\enu\plugcfg"; Components: "max9x64"; Flags: ignoreversion; Source: "Staging\Release - Max 9 - x64\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\9 - 64bit\enu\plugcfg"; Components: "max9x64"; Flags: ignoreversion;
Source: "Staging\Release - Max 2008\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max10}"; Components: "max10"; Flags: isreadme ignoreversion; Source: "Staging\Release - Max 2008\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max10}"; Components: "max10"; Flags: isreadme ignoreversion;
Source: "Staging\Release - Max 2008\NifPlugins.dlu"; DestDir: "{code:InstallPath|max10}{\}plugins"; Components: "max10"; Flags: ignoreversion; Source: "Staging\Release - Max 2008\NifPlugins.dlu"; DestDir: "{code:InstallPath|max10}{\}plugins"; Components: "max10"; Flags: ignoreversion;
...@@ -94,12 +96,23 @@ Source: "Staging\Release - Max 2008\MaxNifTools.ini"; DestDir: "{code:InstallPat ...@@ -94,12 +96,23 @@ Source: "Staging\Release - Max 2008\MaxNifTools.ini"; DestDir: "{code:InstallPat
Source: "Staging\Release - Max 2008\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\2008 - 32bit\enu\plugcfg"; Components: "max10"; Flags: ignoreversion; Source: "Staging\Release - Max 2008\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\2008 - 32bit\enu\plugcfg"; Components: "max10"; Flags: ignoreversion;
Source: "Staging\NifMopp.dll"; DestDir: "{code:InstallPath|max10}{\}plugins"; Components: "max10"; Flags: ignoreversion; Source: "Staging\NifMopp.dll"; DestDir: "{code:InstallPath|max10}{\}plugins"; Components: "max10"; Flags: ignoreversion;
Source: "Staging\Release - Max 2008 - x64\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max10x64}"; Components: "max10x64"; Flags: isreadme ignoreversion;
Source: "Staging\Release - Max 2008 - x64\NifPlugins.dlu"; DestDir: "{code:InstallPath|max10x64}{\}plugins"; Components: "max10x64"; Flags: ignoreversion;
Source: "Staging\Release - Max 2008 - x64\MaxNifTools.ini"; DestDir: "{code:InstallPath|max10x64}{\}plugcfg"; Components: "max10x64"; Flags: ignoreversion;
Source: "Staging\Release - Max 2008 - x64\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\10 - 64bit\enu\plugcfg"; Components: "max10x64"; Flags: ignoreversion;
Source: "Staging\Release - Max 2009\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max11}"; Components: "max11"; Flags: isreadme ignoreversion; Source: "Staging\Release - Max 2009\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max11}"; Components: "max11"; Flags: isreadme ignoreversion;
Source: "Staging\Release - Max 2009\NifPlugins.dlu"; DestDir: "{code:InstallPath|max11}{\}plugins"; Components: "max11"; Flags: ignoreversion; Source: "Staging\Release - Max 2009\NifPlugins.dlu"; DestDir: "{code:InstallPath|max11}{\}plugins"; Components: "max11"; Flags: ignoreversion;
Source: "Staging\Release - Max 2009\MaxNifTools.ini"; DestDir: "{code:InstallPath|max11}{\}plugcfg"; Components: "max11"; Flags: ignoreversion; Source: "Staging\Release - Max 2009\MaxNifTools.ini"; DestDir: "{code:InstallPath|max11}{\}plugcfg"; Components: "max11"; Flags: ignoreversion;
Source: "Staging\Release - Max 2009\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\2009 - 32bit\enu\plugcfg"; Components: "max11"; Flags: ignoreversion; Source: "Staging\Release - Max 2009\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\2009 - 32bit\enu\plugcfg"; Components: "max11"; Flags: ignoreversion;
Source: "Staging\NifMopp.dll"; DestDir: "{code:InstallPath|max11}{\}plugins"; Components: "max11"; Flags: ignoreversion; Source: "Staging\NifMopp.dll"; DestDir: "{code:InstallPath|max11}{\}plugins"; Components: "max11"; Flags: ignoreversion;
Source: "Staging\Release - Max 2009 - x64\Readme.txt"; DestName: "NifPlugins_Readme.txt"; DestDir: "{code:InstallPath|max11x64}"; Components: "max11x64"; Flags: isreadme ignoreversion;
Source: "Staging\Release - Max 2009 - x64\NifPlugins.dlu"; DestDir: "{code:InstallPath|max11x64}{\}plugins"; Components: "max11x64"; Flags: ignoreversion;
Source: "Staging\Release - Max 2009 - x64\MaxNifTools.ini"; DestDir: "{code:InstallPath|max11x64}{\}plugcfg"; Components: "max11x64"; Flags: ignoreversion;
Source: "Staging\Release - Max 2009 - x64\MaxNifTools.ini"; DestDir: "{localappdata}{\}Autodesk\3dsmax\11 - 64bit\enu\plugcfg"; Components: "max11x64"; Flags: ignoreversion;
;Source: "src\*"; DestDir: "{reg:HKLM\SOFTWARE\Bethesda Softworks\Oblivion,Path|{pf}{\}Bethesda Softworks\Oblivion}\Data\niftools"; Components: "src"; Flags: ignoreversion recursesubdirs; ;Source: "src\*"; DestDir: "{reg:HKLM\SOFTWARE\Bethesda Softworks\Oblivion,Path|{pf}{\}Bethesda Softworks\Oblivion}\Data\niftools"; Components: "src"; Flags: ignoreversion recursesubdirs;
[Icons] [Icons]
......
NifProps/bhkHelperFuncs.cpp
+ 2
− 2
View file @ 7a37b016
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "meshadj.h" #include "meshadj.h"
// Includes for WildMagic so we can do the Capsule fitting // Includes for WildMagic so we can do the Capsule fitting
#ifdef USES_WILDMAGIC #if defined(USES_WILDMAGIC) && !defined(_M_X64)
# if _MSC_VER >= 1500 # if _MSC_VER >= 1500
# ifdef _DEBUG # ifdef _DEBUG
# pragma comment (lib, "Wm4Foundation90d") # pragma comment (lib, "Wm4Foundation90d")
...@@ -784,7 +784,7 @@ void BuildScubaMesh(Mesh &mesh, int segs, int smooth, int llsegs, ...@@ -784,7 +784,7 @@ void BuildScubaMesh(Mesh &mesh, int segs, int smooth, int llsegs,
// currently calculate then differently. // currently calculate then differently.
extern void CalcCapsule(Mesh &mesh, Point3& pt1, Point3& pt2, float& r1, float& r2) extern void CalcCapsule(Mesh &mesh, Point3& pt1, Point3& pt2, float& r1, float& r2)
{ {
#ifdef USES_WILDMAGIC #if defined(USES_WILDMAGIC) && !defined(_M_X64)
int nv = mesh.getNumVerts(); int nv = mesh.getNumVerts();
Wm4::Vector3<float>* akPoint = new Wm4::Vector3<float>[nv]; Wm4::Vector3<float>* akPoint = new Wm4::Vector3<float>[nv];
for (int i=0; i<nv; i++) for (int i=0; i<nv; i++)
......
User_Settings.vsprops
+ 3
− 2
View file @ 7a37b016
...@@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
> >
<!-- <!--
Uncomment the following to enable compiling with WildMagic 4. Uncomment the following to enable compiling with WildMagic 4.
-->
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -50,9 +51,9 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -50,9 +51,9 @@ POSSIBILITY OF SUCH DAMAGE.
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalLibraryDirectories="$(WildMagic4SDKDir)\Library\Debug\;$(WildMagic4SDKDir)\Library\Release\" AdditionalLibraryDirectories="$(WildMagic4SDKDir)\Library\Debug\;$(WildMagic4SDKDir)\Library\Release\"
/> />
<UserMacro Name="WildMagic4Dir" Value="$(ProgramFiles)\GeometricTools\WildMagic4\"/>
<UserMacro Name="WildMagic4Dir" Value="C:\Development\Libraries\GeometricTools\WildMagic4\"/>
<UserMacro Name="WildMagic4SDKDir" Value="$(WildMagic4Dir)SDK\"/> <UserMacro Name="WildMagic4SDKDir" Value="$(WildMagic4Dir)SDK\"/>
-->
<!-- <!--
Uncomment and fix the below settings to match your machine or define the macros in your Uncomment and fix the below settings to match your machine or define the macros in your
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment