From d35d1f654eada050c8e553e76b89e9de453265d2 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 27 May 2010 19:04:06 +0200 Subject: [PATCH] Changed: #860 Remove/convert/update Visual C++ projects --- ..._edit.vcproj => nel_patch_edit_adv.vcproj} | 32 +- .../nel_vertex_tree_paint_8.vcproj | 707 ------------------ ...con_search_8.vcproj => icon_search.vcproj} | 97 ++- ...generator_8.vcproj => mp_generator.vcproj} | 115 ++- .../prim_export/prim_export.vcproj | 449 +++++++---- ...parser_8.vcproj => variable_parser.vcproj} | 264 ++++--- 6 files changed, 536 insertions(+), 1128 deletions(-) rename code/nel/tools/3d/plugin_max/nel_patch_edit_adv/{nel_patch_edit.vcproj => nel_patch_edit_adv.vcproj} (95%) delete mode 100644 code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint_8.vcproj rename code/ryzom/tools/leveldesign/icon_search/{icon_search_8.vcproj => icon_search.vcproj} (79%) rename code/ryzom/tools/leveldesign/mp_generator/{mp_generator_8.vcproj => mp_generator.vcproj} (74%) rename code/ryzom/tools/leveldesign/variable_parser/{variable_parser_8.vcproj => variable_parser.vcproj} (82%) diff --git a/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/nel_patch_edit.vcproj b/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/nel_patch_edit_adv.vcproj similarity index 95% rename from code/nel/tools/3d/plugin_max/nel_patch_edit_adv/nel_patch_edit.vcproj rename to code/nel/tools/3d/plugin_max/nel_patch_edit_adv/nel_patch_edit_adv.vcproj index dc2d677ff..384b04e89 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/nel_patch_edit.vcproj +++ b/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/nel_patch_edit_adv.vcproj @@ -1,10 +1,11 @@ @@ -107,9 +110,6 @@ - @@ -208,9 +210,6 @@ - @@ -289,6 +288,8 @@ SubSystem="2" SetChecksum="true" BaseAddress="0x05830000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary=".\Release/neleditpatch.lib" TargetMachine="1" /> @@ -310,9 +311,6 @@ - @@ -391,6 +389,8 @@ SubSystem="2" SetChecksum="true" BaseAddress="0x05830000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary=".\ReleaseDebug/neleditpatch.lib" TargetMachine="1" /> @@ -412,9 +412,6 @@ - @@ -492,6 +489,8 @@ ProgramDatabaseFile=".\Hybrid/neleditpatch.pdb" SubSystem="2" BaseAddress="0x05830000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary=".\Hybrid/neleditpatch.lib" TargetMachine="1" /> @@ -513,9 +512,6 @@ - diff --git a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint_8.vcproj b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint_8.vcproj deleted file mode 100644 index 972ba32ec..000000000 --- a/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/nel_vertex_tree_paint_8.vcproj +++ /dev/null @@ -1,707 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/ryzom/tools/leveldesign/icon_search/icon_search_8.vcproj b/code/ryzom/tools/leveldesign/icon_search/icon_search.vcproj similarity index 79% rename from code/ryzom/tools/leveldesign/icon_search/icon_search_8.vcproj rename to code/ryzom/tools/leveldesign/icon_search/icon_search.vcproj index b12fa8ace..3099f1d2c 100644 --- a/code/ryzom/tools/leveldesign/icon_search/icon_search_8.vcproj +++ b/code/ryzom/tools/leveldesign/icon_search/icon_search.vcproj @@ -1,15 +1,19 @@ + @@ -78,6 +82,8 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/icon_search_d.pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> - @@ -171,6 +174,8 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Release/icon_search_r.pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> - - - @@ -418,7 +411,7 @@ /> + - @@ -113,7 +111,6 @@ OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -172,6 +169,8 @@ IgnoreDefaultLibraryNames="msvcrtd.lib" ProgramDatabaseFile="mp_generator_r.pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> - - @@ -297,7 +292,6 @@ OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -354,6 +348,8 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/mp_generator_d.pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> - @@ -395,7 +388,7 @@ RelativePath="main.cpp" > + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + AdditionalDependencies="freetype.lib libxml2.lib odbc32.lib odbccp32.lib" + OutputFile=".\Release/prim_export.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + ProgramDatabaseFile=".\Release/prim_export.pdb" + SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + /> + Name="VCManagedResourceCompilerTool" + /> + + + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + AdditionalDependencies="freetype.lib libxml2.lib odbc32.lib odbccp32.lib" + OutputFile=".\Debug/prim_export.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/prim_export.pdb" + SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> - - - + Name="VCPostBuildEventTool" + /> @@ -259,57 +381,72 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="main.cpp" + > + Name="Release|x64" + > + PreprocessorDefinitions="" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|x64" + > + BasicRuntimeChecks="3" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + Filter="h;hpp;hxx;hm;inl" + > + RelativePath="..\master\ContinentCfg.h" + > + RelativePath="..\master\easy_cfg.h" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + RelativePath="prim_export.cfg" + > diff --git a/code/ryzom/tools/leveldesign/variable_parser/variable_parser_8.vcproj b/code/ryzom/tools/leveldesign/variable_parser/variable_parser.vcproj similarity index 82% rename from code/ryzom/tools/leveldesign/variable_parser/variable_parser_8.vcproj rename to code/ryzom/tools/leveldesign/variable_parser/variable_parser.vcproj index e5e5cb833..9526fb969 100644 --- a/code/ryzom/tools/leveldesign/variable_parser/variable_parser_8.vcproj +++ b/code/ryzom/tools/leveldesign/variable_parser/variable_parser.vcproj @@ -1,16 +1,20 @@ + @@ -20,7 +24,6 @@ OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -84,6 +87,8 @@ SuppressStartupBanner="true" ProgramDatabaseFile=".\Release/variable_parser_r.pdb" SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> - @@ -118,7 +120,6 @@ OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -182,6 +183,8 @@ GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/variable_parser_d.pdb" SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - @@ -437,7 +433,7 @@ />