Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix some 64bit issues
- Typedef for 64bit were missing
- Include path for 64bit was incomplete
- morpher_x64.lib was generated from wrong dlm
  • Loading branch information
opencollada-sebastian committed May 27, 2009
1 parent 8d0d3ed commit 386f5d8
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 7 deletions.
58 changes: 58 additions & 0 deletions COLLADAMax/lib/morpher_x64.def
@@ -0,0 +1,58 @@
; create from existing DLM file (taken from the 64bit max installation) via
; dumpbin /exports Morpher.dlm
; lib /def:Morpher_x64.def /machine:x64 /out:morpher_x64.lib

LIBRARY Morpher.dlm
EXPORTS
??4morphChannel@@QEAAXAEBV0@@Z
?AddProgessiveMorph@IMorphClass@@QEAAHPEAVMorphR3@@HPEAVINode@@@Z
?AllocBuffers@morphChannel@@QEAAXHH@Z
?AreWeCached@morphCache@@QEAAHXZ
?ChannelOp@MorphR3@@QEAAXHHH@Z
?Clamp_chanNum@MorphR3@@QEAAXXZ
?Clamp_listSel@M3MatDlg@@QEAAXXZ
?DeleteProgessiveMorph@IMorphClass@@QEAAHPEAVMorphR3@@HH@Z
?EnterMode@GetMorphMod@@UEAAXXZ
?EnterMode@GetMorphNode@@UEAAXPEAVIObjParam@@@Z
?ExitMode@GetMorphMod@@UEAAXXZ
?ExitMode@GetMorphNode@@UEAAXPEAVIObjParam@@@Z
?Filter@GetMorphMod@@UEAAHPEAVINode@@@Z
?Filter@GetMorphNode@@UEAAHPEAVINode@@@Z
?GetFilter@GetMorphNode@@UEAAPEAVPickNodeCallback@@XZ
?GetIncrements@MorphR3@@QEAAMXZ
?HitTest@GetMorphNode@@UEAAHPEAVIObjParam@@PEAUHWND__@@PEAVViewExp@@VIPoint2@@H@Z
?HoldChannel@IMorphClass@@QEAAXPEAVMorphR3@@H@Z
?HoldMarkers@IMorphClass@@QEAAXPEAVMorphR3@@@Z
?Load@morphChannel@@QEAA?AW4IOResult@@PEAVILoad@@@Z
?MakeCache@morphCache@@QEAAXPEAVObject@@@Z
?NukeCache@morphCache@@QEAAXXZ
?Pick@GetMorphMod@@UEAAHPEAVINode@@@Z
?Pick@GetMorphNode@@UEAAHPEAVIObjParam@@PEAVViewExp@@@Z
?ResetMe@morphChannel@@QEAAXXZ
?RightClick@GetMorphNode@@UEAAHPEAVIObjParam@@PEAVViewExp@@@Z
?Save@morphChannel@@QEAA?AW4IOResult@@PEAVISave@@@Z
?SetTension@IMorphClass@@QEAAXPEAVMorphR3@@HM@Z
?SortProgressiveTarget@IMorphClass@@QEAAXPEAVMorphR3@@HH@Z
?SwapMorphs@IMorphClass@@QEAAXPEAVMorphR3@@HHH@Z
?SwapPTargets@IMorphClass@@QEAAXPEAVMorphR3@@HHH_N@Z
?TrimDown@MorphR3@@QEAAMMH@Z
?UpdateMorphInfo@M3MatDlg@@QEAAXH@Z
?Update_SpinnerIncrements@MorphR3@@QEAAXXZ
?Update_channelFULL@MorphR3@@QEAAXXZ
?Update_channelInfo@MorphR3@@QEAAXXZ
?Update_channelLimits@MorphR3@@QEAAXXZ
?Update_channelMarkers@MorphR3@@QEAAXXZ
?Update_channelNames@MorphR3@@QEAAXXZ
?Update_channelParams@MorphR3@@QEAAXXZ
?Update_channelValues@MorphR3@@QEAAXXZ
?Update_colorIndicators@MorphR3@@QEAAXXZ
?VScroll@M3MatDlg@@QEAAXHF@Z
?VScroll@MorphR3@@QEAAXHF@Z
?buildFromNode@morphChannel@@QEAAXPEAVINode@@HHH@Z
?getMemSize@morphChannel@@QEAAMXZ
?rebuildChannel@morphChannel@@QEAAXXZ
CanAutoDefer
LibClassDesc
LibDescription
LibNumberClasses
LibVersion
Binary file modified COLLADAMax/lib/morpher_x64.lib
Binary file not shown.
5 changes: 2 additions & 3 deletions COLLADAMax/lib/morpher.def → COLLADAMax/lib/morpher_x86.def
@@ -1,7 +1,6 @@
; create from existing DLM file via
; create from existing DLM file (taken from the 64bit max installation) via
; dumpbin /exports Morpher.dlm
; lib /def:Morpher.def /machine:x64 /out:morpher_x64.lib
; lib /def:Morpher.def /machine:x86 /out:morpher_x86.lib
; lib /def:Morpher_x86.def /machine:x86 /out:morpher_x86.lib

LIBRARY Morpher.dlm
EXPORTS
Expand Down
Binary file modified COLLADAMax/lib/morpher_x86.lib
Binary file not shown.
Expand Up @@ -113,7 +113,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include"
AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;&quot;$(BOOST_ROOT)&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
Expand Down Expand Up @@ -246,7 +246,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include"
AdditionalIncludeDirectories="..\include;..\..\COLLADABaseUtils\include;..\..\GeneratedSaxParser\include;..\..\COLLADAFramework\include;..\..\Externals\LibXML\include;&quot;$(BOOST_ROOT)&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="true"
Expand Down
6 changes: 4 additions & 2 deletions GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h
Expand Up @@ -48,7 +48,8 @@ namespace GeneratedSaxParser
size_t size;
};

#if defined COLLADABU_OS_WIN32
#if defined COLLADABU_OS_WIN
// VisualStudio 2005 uses same sizes for 32 and 64 bit
typedef signed char sint8;
typedef signed short sint16;
typedef signed int sint32;
Expand All @@ -70,7 +71,8 @@ namespace GeneratedSaxParser
typedef unsigned int uint32;
typedef unsigned long long uint64;

#elif defined COLLADABU_OS_MAC32
#elif defined COLLADABU_OS_MAC
// XCode uses same sizes for 32 and 64 bit
typedef signed char sint8;
typedef signed short sint16;
typedef signed int sint32;
Expand Down

0 comments on commit 386f5d8

Please sign in to comment.