Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21032 Modified Files: clientr.sln clientr.suo clientr.vcproj Log Message: Fix 2 problems found by profiling, both repeated strcmp calls, one in the hockey_mode check and one in the SDB lookup function. Added new set of flags to window structure, sdb_flags, that are set on window creation to flag a window as "local" or "map", rather than having to string compare the name. A few changes in compiler settings from moving to VS 2005 PE, also some flags that were changed to work for profiling. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 Binary files /tmp/cvspTbGMA and /tmp/cvsYhVJ9B differ Index: clientr.vcproj =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- clientr.vcproj 26 Feb 2007 07:53:02 -0000 1.9 +++ clientr.vcproj 27 Feb 2007 08:37:05 -0000 1.10 @@ -45,9 +45,10 @@ Name="VCCLCompilerTool" AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE"
/D "_CRT_NONSTDC_NO_DEPRECATE"" Optimization="0" + WholeProgramOptimization="false" AdditionalIncludeDirectories="win32;win32\h;win32\SDL;include" PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;RSA;_CONSOLE" - MinimalRebuild="true" + MinimalRebuild="false" RuntimeLibrary="1" PrecompiledHeaderFile="\netrek_files\tmp\src\Debug/clientr.pch" AssemblerListingLocation="\netrek_files\tmp\src\Debug/" @@ -80,6 +81,7 @@ IgnoreAllDefaultLibraries="true" GenerateDebugInformation="true" ProgramDatabaseFile="\netrek_files\tmp\src\Debug/netrek.pdb" + GenerateMapFile="false" SubSystem="1" TargetMachine="1" /> @@ -150,6 +152,7 @@ AdditionalIncludeDirectories="win32;win32\h;include;win32\SDL" PreprocessorDefinitions="WIN32;NDEBUG;RSA;_CONSOLE" StringPooling="true" + MinimalRebuild="false" RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile="\netrek_files\tmp\src\Release/clientr.pch" @@ -159,6 +162,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="0" /> <Tool Name="VCManagedResourceCompilerTool" @@ -181,6 +185,8 @@ AdditionalLibraryDirectories="win32\lib;win32\lib\VCC" IgnoreAllDefaultLibraries="true" EmbedManagedResourceFile="main.ico" + GenerateDebugInformation="false" + AssemblyDebug="0" SubSystem="1" TargetMachine="1" /> Index: clientr.sln =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- clientr.sln 12 May 2006 02:27:46 -0000 1.1 +++ clientr.sln 27 Feb 2007 08:37:05 -0000 1.2 @@ -3,10 +3,6 @@ # Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientr", "clientr.vcproj", "{AF2EDB01-9BF0-463A-96EF-046B5845BAE8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winkey", "src\winkey\winkey.vcproj", "{DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curslib", "src\cursors\curslib.vcproj", "{74EFAF4D-D9A0-421D-8A94-08DBB03D533C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -17,14 +13,6 @@ {AF2EDB01-9BF0-463A-96EF-046B5845BAE8}.Debug|Win32.Build.0 = Debug|Win32 {AF2EDB01-9BF0-463A-96EF-046B5845BAE8}.Release|Win32.ActiveCfg = Release|Win32 {AF2EDB01-9BF0-463A-96EF-046B5845BAE8}.Release|Win32.Build.0 = Release|Win32 - {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Debug|Win32.Build.0 = Debug|Win32 - {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Release|Win32.ActiveCfg = Release|Win32 - {DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}.Release|Win32.Build.0 = Release|Win32 - {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Debug|Win32.ActiveCfg = Debug|Win32 - {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Debug|Win32.Build.0 = Debug|Win32 - {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Release|Win32.ActiveCfg = Release|Win32 - {74EFAF4D-D9A0-421D-8A94-08DBB03D533C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE