Fixed: icon_search project

code/ryzom/tools/leveldesign/icon_search/icon_search.cpp

@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#define USE_JPEG
-
 #include <nel/misc/types_nl.h>
 #include <nel/misc/file.h>
 #include <nel/misc/sstring.h>

code/ryzom/tools/leveldesign/icon_search/icon_search.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="icon_search"
 	ProjectGUID="{D9678C2E-5137-4A48-BA0D-51B652A08624}"
 	RootNamespace="icon_search"
@@ -23,7 +23,6 @@
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -40,50 +39,30 @@
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/icon_search.tlb"
-				HeaderFileName=""
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="4"
-				AdditionalIncludeDirectories="../../../../../code/nel/include"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\Debug/icon_search.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
-				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="jpeg.lib odbc32.lib odbccp32.lib"
 				OutputFile="icon_search_d.exe"
-				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="msvcrt"
-				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/icon_search_d.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -97,8 +76,6 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/icon_search.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -111,11 +88,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
-			OutputDirectory=".\Release"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory=".\Release"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -132,51 +108,31 @@
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/icon_search.tlb"
-				HeaderFileName=""
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="4"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../../code/nel/include"
+				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				StringPooling="true"
+				MinimalRebuild="true"
-				RuntimeLibrary="2"
+				BasicRuntimeChecks="3"
-				EnableFunctionLevelLinking="true"
+				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile=".\Release/icon_search.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="jpeg.lib odbc32.lib odbccp32.lib"
+				OutputFile="icon_search_d.exe"
-				OutputFile="icon_search_r.exe"
+				IgnoreDefaultLibraryNames="msvcrt"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Release/icon_search_r.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
+				TargetMachine="17"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -189,8 +145,6 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/icon_search.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -203,11 +157,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\Release"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -226,50 +179,40 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
+				TypeLibraryName=".\Release/icon_search.tlb"
-				TypeLibraryName=".\Debug/icon_search.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="3"
-				AdditionalIncludeDirectories="../../../../../code/nel/include"
+				InlineFunctionExpansion="2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				EnableIntrinsicFunctions="true"
-				MinimalRebuild="true"
+				FavorSizeOrSpeed="1"
-				BasicRuntimeChecks="3"
+				OmitFramePointers="true"
-				RuntimeLibrary="3"
+				EnableFiberSafeOptimizations="true"
-				RuntimeTypeInfo="true"
+				AdditionalIncludeDirectories=""
-				PrecompiledHeaderFile=".\Debug/icon_search.pch"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
-				AssemblerListingLocation=".\Debug/"
+				StringPooling="true"
-				ObjectFile=".\Debug/"
+				ExceptionHandling="2"
-				ProgramDataBaseFileName=".\Debug/"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="jpeg.lib odbc32.lib odbccp32.lib"
+				OutputFile="icon_search_r.exe"
-				OutputFile="icon_search_d.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/icon_search_d.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
+				OptimizeReferences="2"
-				DataExecutionPrevention="0"
+				EnableCOMDATFolding="2"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -282,8 +225,6 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/icon_search.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -300,7 +241,6 @@
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
@@ -334,24 +274,22 @@
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				WarningLevel="3"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="icon_search_r.exe"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -368,8 +306,6 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/icon_search.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -392,46 +328,6 @@
 			<File
 				RelativePath="icon_search.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="icon_search.h"
-				>
 			</File>
 		</Filter>
 		<Filter