Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: world_editor_sound_plugin compilation on 64 bits

Browse source
This commit is contained in:
kervala 2010-06-27 14:49:17 +02:00
parent fd08cc8e97
commit 9a5834a5e7
4 changed files with 86 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
View file

@ -76,8 +76,8 @@ public:
bool operator== (const CDatabaseLocator &other) const; bool operator== (const CDatabaseLocator &other) const;
bool operator< (const CDatabaseLocator &other) const bool operator< (const CDatabaseLocator &other) const
{ {
const uint size = _LocateStack.size (); const uint size = (uint)_LocateStack.size ();
const uint otherSize = other._LocateStack.size (); const uint otherSize = (uint)other._LocateStack.size ();
const uint minSize = std::min (size, otherSize); const uint minSize = std::min (size, otherSize);
uint i; uint i;
for (i=0; i<minSize; i++) for (i=0; i<minSize; i++)

2
code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp
View file

@ -208,7 +208,7 @@ void CDialogFlags::lostPositionControl()
CheckMoveEar.SetBitmap(EarBitmap); CheckMoveEar.SetBitmap(EarBitmap);
} }
void CDialogFlags::OnTimer(UINT nIDEvent) void CDialogFlags::OnTimer(UINT_PTR nIDEvent)
{ {
CDialog::OnTimer(nIDEvent); CDialog::OnTimer(nIDEvent);

2
code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h
View file

@ -83,7 +83,7 @@ protected:
//{{AFX_MSG(CDialogFlags) //{{AFX_MSG(CDialogFlags)
afx_msg void OnButtonPlayStop(); afx_msg void OnButtonPlayStop();
afx_msg void OnCheckMoveEar(); afx_msg void OnCheckMoveEar();
afx_msg void OnTimer(UINT nIDEvent); afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnDestroy(); afx_msg void OnDestroy();
afx_msg void OnReload(); afx_msg void OnReload();

175
code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.vcproj
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9,00"
Name="world_editor_sound_plugin" Name="world_editor_sound_plugin"
ProjectGUID="{CBEDEB8E-18EA-4699-BF0F-061F0F644780}" ProjectGUID="{CBEDEB8E-18EA-4699-BF0F-061F0F644780}"
TargetFrameworkVersion="0"
> >
<Platforms> <Platforms>
<Platform <Platform
@ -65,12 +66,9 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\install\$(ProjectName)_d.dll" OutputFile="..\..\install\$(ProjectName)_d.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="msvcrt.lib" IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)\$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -95,6 +93,84 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="2"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="4"
InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
BasicRuntimeChecks="3"
SmallerTypeCheck="true"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1036"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\install\$(ProjectName)_d.dll"
IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)" OutputDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
@ -148,13 +224,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\install\$(ProjectName)_r.dll" OutputFile="..\..\install\$(ProjectName)_r.dll"
LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)\$(TargetName).lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -179,87 +252,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
ConfigurationType="2"
UseOfMFC="2"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="4"
InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
BasicRuntimeChecks="3"
SmallerTypeCheck="true"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1036"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\install\$(ProjectName)_d.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
SubSystem="2"
ImportLibrary="$(OutDir)\$(TargetName).lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)" OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
@ -314,13 +306,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\install\$(ProjectName)_r.dll" OutputFile="..\..\install\$(ProjectName)_r.dll"
LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)\$(TargetName).lib"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
@ -381,7 +370,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Debug|x64"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -389,7 +378,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|x64" Name="Release|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"