Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Fixed: world_editor_sound_plugin compilation on 64 bits

Browse Source
hg/feature/sound
kervala 15 years ago
parent 7cb5099a1c
commit d24c112408
4 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File

4
code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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();

81
code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.vcproj
Unescape Escape 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
@ -96,9 +94,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|x64"
OutputDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)" OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="2" UseOfMFC="2"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
@ -118,18 +116,16 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="3" Optimization="4"
InlineFunctionExpansion="2" InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
FavorSizeOrSpeed="1" BasicRuntimeChecks="3"
OmitFramePointers="true" SmallerTypeCheck="true"
EnableFiberSafeOptimizations="true" RuntimeLibrary="3"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
@ -139,7 +135,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="_DEBUG"
Culture="1036" Culture="1036"
/> />
<Tool <Tool
@ -147,15 +143,11 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\install\$(ProjectName)_r.dll" OutputFile="..\..\install\$(ProjectName)_d.dll"
LinkIncremental="1" IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" TargetMachine="17"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)\$(TargetName).lib"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -180,9 +172,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Release|Win32"
OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)" OutputDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
ConfigurationType="2" ConfigurationType="2"
UseOfMFC="2" UseOfMFC="2"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
@ -202,16 +194,18 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="4" Optimization="3"
InlineFunctionExpansion="1" InlineFunctionExpansion="2"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS" EnableIntrinsicFunctions="true"
BasicRuntimeChecks="3" FavorSizeOrSpeed="1"
SmallerTypeCheck="true" OmitFramePointers="true"
RuntimeLibrary="3" EnableFiberSafeOptimizations="true"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="3" DebugInformationFormat="3"
@ -221,7 +215,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
Culture="1036" Culture="1036"
/> />
<Tool <Tool
@ -229,14 +223,12 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\install\$(ProjectName)_d.dll" OutputFile="..\..\install\$(ProjectName)_r.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)\$(TargetName).lib" OptimizeReferences="2"
TargetMachine="17" EnableCOMDATFolding="2"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -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"

Write Preview
Loading…
Cancel
Save