rebuilt gtk binary dependencies file

fixed/optimized a number of VC9 project settings
fixed sprintf being hijacked by intl.dll stuff

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@345 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/config.py b/config.py
index e91e9f1f2e62843509e2799dcd6f9722d6ad7d50..5ae584be68998efab4e2403423f970e78fb751cc 100644 (file)
--- a/config.py
+++ b/config.py
@@ -273,7 +273,7 @@ class Config:
                        self.FetchGamePaks( self.install_directory )
                # NOTE: unrelated to self.setup_platforms - grab support files and binaries and install them
                if ( self.platform == 'Windows' ):
-                       depsfile = 'GtkR-deps-1.6-4.zip'
+                       depsfile = 'GtkR-deps-1.6-5.zip'
                        if ( not os.path.exists( depsfile ) ):
                                cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.1/%s' % depsfile ]
                                print( repr( cmd ) )
@@ -291,28 +291,37 @@ class Config:
                                # copy all the dependent runtime data to the install directory
                                srcdir = os.path.dirname( backup_cwd )
                                for f in [
+                                       # USE THE DEPENDENCY WALKER
+                                        # tier 1: radiant.exe direct deps
+                                        # tier 2: deps of tier 1 DLLs
+                                        # etc.
+                                        # tier 1
                                        'libxml2/bin/libxml2.dll',
+                                        'libxml2/bin/iconv.dll',
                                        'gtk2/bin/libglib-2.0-0.dll',
                                        'gtk2/bin/libgobject-2.0-0.dll',
                                        'gtk2/bin/libgdk-win32-2.0-0.dll',
                                        'gtk2/bin/libgtk-win32-2.0-0.dll',
                                        'gtk2/bin/intl.dll',
-                                       'gtk2/bin/libatk-1.0-0.dll',
-                                       'gtk2/bin/libcairo-2.dll',
-                                       'gtk2/bin/libgdk_pixbuf-2.0-0.dll',
-                                       'gtk2/bin/libgmodule-2.0-0.dll',
-                                       'gtk2/bin/libpng13.dll',
                                        'gtk2/bin/libpango-1.0-0.dll',
                                         'gtk2/bin/libpangoft2-1.0-0.dll',
+                                       'gtk2/lib/gtkglext-1.2.0/lib/libgtkglext-win32-1.0-0.dll',
+                                       'gtk2/lib/gtkglext-1.2.0/lib/libgdkglext-win32-1.0-0.dll',
+                                        # tier 2
+                                        'gtk2/bin/libgthread-2.0-0.dll',
+                                       'gtk2/bin/libcairo-2.dll',
+                                       'gtk2/bin/libgdk_pixbuf-2.0-0.dll',
                                        'gtk2/bin/libpangocairo-1.0-0.dll',
                                        'gtk2/bin/libpangowin32-1.0-0.dll',
-                                       'gtk2/lib/libgtkglext-win32-1.0-0.dll',
-                                       'gtk2/lib/libgdkglext-win32-1.0-0.dll',
-                                       'gtk2/lib/iconv.dll',
-                                        'gtk2/zlib1.dll',
-                                        'freetype-dev_2.4.2-1_win32/bin/freetype6.dll',
-                                        'fontconfig-dev_2.8.0-2_win32/bin/libfontconfig-1.dll',
-                                        'expat_2.0.1-1_win32/bin/libexpat-1.dll',
+                                       'gtk2/bin/libatk-1.0-0.dll',
+                                       'gtk2/bin/libgmodule-2.0-0.dll',
+                                        'gtk2/bin/libfontconfig-1.dll',
+                                        'gtk2/bin/freetype6.dll',
+                                        # tier 3
+                                        'gtk2/bin/libexpat-1.dll',
+                                        'gtk2/bin/libpng14-14.dll',
+                                        'gtk2/bin/zlib1.dll',
+                                        'gtk2/bin/libgio-2.0-0.dll',                                        
                                         ]:
                                         cmd = [ 'cp', '-v', os.path.join( srcdir, f ), 'install' ]
                                         print( repr( cmd ) )
@@ -320,9 +329,6 @@ class Config:
                                for d in [
                                        'gtk2/etc',
                                        'gtk2/share',
-                                        'fontconfig-dev_2.8.0-2_win32/etc',
-                                        'fontconfig-dev_2.8.0-2_win32/share',
-                                        'freetype-dev_2.4.2-1_win32/share',
                                        ]:
                                         cmd = [ 'cp', '-r', '-v', os.path.join( srcdir, d ), 'install' ]
                                        print( repr( cmd ) )

diff --git a/contrib/camera/camera.def b/contrib/camera/camera.def
index 6a59743817b4d6354faf9650400f42fd00e6871f..ddec12c7c047ba3daad7f800431024d9d275b9a1 100644 (file)
--- a/contrib/camera/camera.def
+++ b/contrib/camera/camera.def
@@ -1,7 +1,6 @@
 ; camera.def : Declares the module parameters for the DLL.
 
 LIBRARY      "CAMERA"
-DESCRIPTION  'CAMERA Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/contrib/camera/camera_VC9.vcproj b/contrib/camera/camera_VC9.vcproj
index e10dbd777a179c8992f7b7b60a800da03b5c81af..bf1b24cd0e69504ae399ac168cf64cc1eee96066 100755 (executable)
--- a/contrib/camera/camera_VC9.vcproj
+++ b/contrib/camera/camera_VC9.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -115,7 +115,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
+                               WholeProgramOptimization="true"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/entity/entity.def b/plugins/entity/entity.def
index 6c40d04029817c2de5ea188cbdabeecc3af5c9b0..b6ccf57d61c45cdde521907c44b2f54562e3573f 100644 (file)
--- a/plugins/entity/entity.def
+++ b/plugins/entity/entity.def
@@ -1,7 +1,6 @@
 ; entity.def : Declares the module parameters for the DLL.
 
 LIBRARY      "ENTITY"
-DESCRIPTION  'ENTITY Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/entity/entity_VC9.vcproj b/plugins/entity/entity_VC9.vcproj
index ae78d29721b86708f8f7b824f5d9715c0b784c73..2206d7707682694334e14e9ca858354bd4b7ebb4 100755 (executable)
--- a/plugins/entity/entity_VC9.vcproj
+++ b/plugins/entity/entity_VC9.vcproj
@@ -115,6 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/image/image.def b/plugins/image/image.def
index 7763585827ae4b5c2b33cec7769a6e73a79e28a5..26d413c778be9c1e9b5489d275ece63f94998590 100644 (file)
--- a/plugins/image/image.def
+++ b/plugins/image/image.def
@@ -1,7 +1,6 @@
 ; image.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Image"
-DESCRIPTION  'Image Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/image/image_VC9.vcproj b/plugins/image/image_VC9.vcproj
index 965512a39455970515d201d5619707d03b2994dc..d5f78f602239d74cbdfbfba5c50dd36b22357d64 100755 (executable)
--- a/plugins/image/image_VC9.vcproj
+++ b/plugins/image/image_VC9.vcproj
@@ -61,6 +61,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/NODEFAULTLIB:MSVCRT"\r
                                AdditionalDependencies=" synapse.lib libxml2.lib glib-2.0.lib gobject-2.0.lib libjpeg.lib"\r
                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;;&quot;$(SolutionDir)\..\jpeg-6b&quot;"\r
                                ModuleDefinitionFile="image.def"\r

diff --git a/plugins/imagepng/imagepng.def b/plugins/imagepng/imagepng.def
index cc87688556e30a7d344adb9fd2d575666f2eb25a..64f59c0d7d44b52a94ac6253ed0dcb64493e57f5 100644 (file)
--- a/plugins/imagepng/imagepng.def
+++ b/plugins/imagepng/imagepng.def
@@ -1,7 +1,6 @@
 ; imagepng.def : Declares the module parameters for the DLL.
 
 LIBRARY      "IMAGEPNG"
-DESCRIPTION  'IMAGEPNG Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/imagepng/imagepng_VC9.vcproj b/plugins/imagepng/imagepng_VC9.vcproj
index 49ed15345a881002ff044a94104d4a6b65b14827..254192894b2fc3a9f6821b1fc3bceb7d65e55025 100755 (executable)
--- a/plugins/imagepng/imagepng_VC9.vcproj
+++ b/plugins/imagepng/imagepng_VC9.vcproj
@@ -115,6 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/imagepng/plugin.cpp b/plugins/imagepng/plugin.cpp
index 5d8bba70fe998258b249c5f1e71a6c6fc7297392..fda3e6f0572f58c7b453e3304308f87609ae66d5 100644 (file)
--- a/plugins/imagepng/plugin.cpp
+++ b/plugins/imagepng/plugin.cpp
@@ -137,7 +137,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig
   // http://www.libpng.org/pub/png/libpng-manual.html
 
   png_structp png_ptr = png_create_read_struct
-    (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+    (PNG_LIBPNG_VER_STRING, NULL,
     user_error_fn, user_warning_fn);
   if (!png_ptr)
   {
@@ -148,7 +148,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig
   png_infop info_ptr = png_create_info_struct(png_ptr);
   if (!info_ptr) {
     png_destroy_read_struct(&png_ptr,
-      png_infopp_NULL, png_infopp_NULL);
+      NULL, NULL);
     g_FuncTable.m_pfnSysPrintf ("libpng error: png_create_info_struct (info_ptr)\n");
     return;
   }
@@ -156,7 +156,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig
   png_infop end_info = png_create_info_struct(png_ptr);
   if (!end_info) {
     png_destroy_read_struct(&png_ptr, &info_ptr,
-      png_infopp_NULL);
+      NULL);
     g_FuncTable.m_pfnSysPrintf ("libpng error: png_create_info_struct (end_info)\n");
     return;
   }
@@ -187,8 +187,10 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig
   if (color_type == PNG_COLOR_TYPE_PALETTE)
    png_set_palette_to_rgb(png_ptr);
 
-  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-    png_set_gray_1_2_4_to_8(png_ptr);
+  if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+         // png_set_gray_1_2_4_to_8 was renamed to png_set_expand_gray_1_2_4_to_8
+    png_set_expand_gray_1_2_4_to_8(png_ptr);
+  }
 
   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
     png_set_tRNS_to_alpha(png_ptr);
@@ -234,7 +236,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig
   png_read_end(png_ptr, info_ptr);
 
   /* free up the memory structure */
-  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
   free(row_pointers);
   g_FileSystemTable.m_pfnFreeFile (fbuffer);

diff --git a/plugins/map/map.def b/plugins/map/map.def
index 80a9c861bf256146dfb4998a00bfbb8a2abbb40f..3f16e0ed423b0754505a68d270c4d6936b785989 100644 (file)
--- a/plugins/map/map.def
+++ b/plugins/map/map.def
@@ -1,7 +1,6 @@
 ; mapq3.def : Declares the module parameters for the DLL.
 
-LIBRARY      "MAPQ3"
-DESCRIPTION  'MAPQ3 Windows Dynamic Link Library'
+LIBRARY      "MAP"
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/map/map_VC9.vcproj b/plugins/map/map_VC9.vcproj
index f7d7c8947bbc3c365e1b7d9767737291413f586f..52617f01548e359f7f5746619523e9b911794dc0 100755 (executable)
--- a/plugins/map/map_VC9.vcproj
+++ b/plugins/map/map_VC9.vcproj
@@ -115,6 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/mapxml/mapxml.def b/plugins/mapxml/mapxml.def
index feca2974aa22378fc915c1815dddee22f5f5baa9..5835ac808dc1eb89b88d40321417d038a1283aaa 100644 (file)
--- a/plugins/mapxml/mapxml.def
+++ b/plugins/mapxml/mapxml.def
@@ -1,7 +1,6 @@
 ; mapxml.def : Declares the module parameters for the DLL.
 
 LIBRARY      "MAPXML"
-DESCRIPTION  'MAPXML Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/mapxml/mapxml_VC9.vcproj b/plugins/mapxml/mapxml_VC9.vcproj
index ab492ecb369e29667c468d5b1867a67fec019c0d..82e793b1311ae32cc97b908e2186a38071d53d09 100755 (executable)
--- a/plugins/mapxml/mapxml_VC9.vcproj
+++ b/plugins/mapxml/mapxml_VC9.vcproj
@@ -115,6 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/model/model.def b/plugins/model/model.def
index 01cee0f0e06604da3aaffd7236ddfe13db5ab48c..7f3bb9e998991776877ea92b8e384963acc5f584 100644 (file)
--- a/plugins/model/model.def
+++ b/plugins/model/model.def
@@ -1,7 +1,6 @@
 ; model.def : Declares the module parameters for the DLL.
 
 LIBRARY      "MODEL"
-DESCRIPTION  'MODEL Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/model/model_VC9.vcproj b/plugins/model/model_VC9.vcproj
index 3274786859cb648368ea46bf3d445e7aaaa3fe86..3faf99214cdb014b0562c5b10b9596ec478d6a3d 100755 (executable)
--- a/plugins/model/model_VC9.vcproj
+++ b/plugins/model/model_VC9.vcproj
@@ -115,6 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/shaders/shaders.def b/plugins/shaders/shaders.def
index 3f3b6a1e4c7249d526e524e48a1302aeb3579147..9d8e0b87b7dd2261232cc0637e5e3b092f9fd1eb 100644 (file)
--- a/plugins/shaders/shaders.def
+++ b/plugins/shaders/shaders.def
@@ -1,7 +1,6 @@
 ; shaders.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Shaders"
-DESCRIPTION  'Shaders Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/shaders/shaders_VC9.vcproj b/plugins/shaders/shaders_VC9.vcproj
index 674153125c3f8c39e49b6e3a8ae0917487ef6a47..d8fc96a055784bec7cec94109e85fe04dd7648f3 100755 (executable)
--- a/plugins/shaders/shaders_VC9.vcproj
+++ b/plugins/shaders/shaders_VC9.vcproj
@@ -115,6 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/surface/surface.def b/plugins/surface/surface.def
index 23328e4a68467b52090dcf1b382702d44d5c3ab5..7304330949aedeecadefd125bc66bb4fde64da39 100644 (file)
--- a/plugins/surface/surface.def
+++ b/plugins/surface/surface.def
@@ -1,7 +1,6 @@
 ; surface.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SURFACE"
-DESCRIPTION  'SURFACE Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/surface/surface_VC9.vcproj b/plugins/surface/surface_VC9.vcproj
index 95bc261ab9222468c43726690d9a17eba21b41d9..9f10e5aa428b20850e2d83a1386f59220b8d863a 100755 (executable)
--- a/plugins/surface/surface_VC9.vcproj
+++ b/plugins/surface/surface_VC9.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -115,7 +115,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
+                               WholeProgramOptimization="true"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/plugins/vfspk3/vfspk3.def b/plugins/vfspk3/vfspk3.def
index d4c34e7fef1c325055c4434c6d61e9eaa0d4df55..aa4146544bae8347dfe107d3c5e7bd2fc9e66102 100644 (file)
--- a/plugins/vfspk3/vfspk3.def
+++ b/plugins/vfspk3/vfspk3.def
@@ -1,7 +1,6 @@
 ; vfspk3.def : Declares the module parameters for the DLL.
 
 LIBRARY      "VFSPK3"
-DESCRIPTION  'VFSPK3 Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here

diff --git a/plugins/vfspk3/vfspk3_VC9.vcproj b/plugins/vfspk3/vfspk3_VC9.vcproj
index 6255ececba94fe7f83000e094e8de50886dabb26..24b06b9b9783d9a63b698f5e1e31530d1a215a8b 100755 (executable)
--- a/plugins/vfspk3/vfspk3_VC9.vcproj
+++ b/plugins/vfspk3/vfspk3_VC9.vcproj
@@ -115,6 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="true"\r
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
@@ -140,6 +141,7 @@
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r

diff --git a/radiant/file.cpp b/radiant/file.cpp
index 5d051ca1955aabc9f0e3a65f29ebb27f0236b576..b0c66ed6e5221d63fd5ac3b79edab551a37fca66 100644 (file)
--- a/radiant/file.cpp
+++ b/radiant/file.cpp
@@ -244,7 +244,7 @@ bool FileStream::Open(const char *filename, const char *mode)
   m_hFile = fopen(filename, mode);
   m_bCloseOnDelete = true;
 
-  return (m_hFile != NULL);
+  return m_hFile != NULL;
 }
 
 void MemStream::Close()

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index d87f2919be9dabe9c8774694c099e4abb23cc1bf..43ebe40ae17e2c8c710715bba8f4c03d1427a25e 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -2841,7 +2841,7 @@ void DoCommandListDlg ()
       cmds = g_slist_sort (cmds, (gint (*)(const void *, const void *))strcmp);
 
       Sys_Printf("Writing the command list to %s", path.GetBuffer() );
-      FILE* fileout = fopen (path.GetBuffer (), "wt");
+      FILE * fileout = fopen( path.GetBuffer (), "wt" );
 
       while (cmds)
       {

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 493520f0c584e1962f88bb9686b1b87c06db7502..7f7dba22fae19e3dd3dc2991ad919bcb4ac5cdd1 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -7079,7 +7079,7 @@ void MainFrame::OnSelectFuncGroup()
        // check to see if the selected brush is part of a func group
        // if it is, deselect everything and reselect the next brush 
        // in the group
-       brush_t *b2, *b = selected_brushes.next;
+       brush_t *b = selected_brushes.next;
        entity_t * e;
        if (b != &selected_brushes)
        {

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 9a71c25b95c7a474f08bc39547949d454af8b7de..faff442e3510d4d6c5009c4f74af2a96e8dd1ff8 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -39,6 +39,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "missing.h"
 #include "gtkmisc.h"
 
+#ifdef _WIN32
+       // sanity check - some gtk2 win32 runtimes replace sprintf
+       #if defined( sprintf )
+               #error sprintf is a macro. are you sure?
+       #endif
+#endif
+
 #ifdef _WIN32
 #include <io.h>
 #define X_OK 0
@@ -3359,7 +3366,7 @@ void CGameInstall::BuildDialog() {
 
 void CGameInstall::Run() {
        ScanGames();
-       if (m_availGames[0] == GAME_NONE) {
+       if ( m_availGames[0] == GAME_NONE ) {
                return;
        }
        if ( DoModal() == IDCANCEL ) {
@@ -3375,8 +3382,8 @@ void CGameInstall::Run() {
        gameFilePath += ".game";
        Sys_Printf( "game file: %s\n", gameFilePath.GetBuffer() );
 
-       FILE *fg = fopen( gameFilePath.GetBuffer(), "w" );
-       if ( fg == NULL || ferror( fg ) ) {
+       FILE * fg = fopen( gameFilePath.GetBuffer(), "w" );
+       if ( fg == NULL ) {
                Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() );
        }
        fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );

diff --git a/radiant/radiant_VC9.vcproj b/radiant/radiant_VC9.vcproj
index 403705d174b283796f84df492c9ca24407f18154..e562107c311b89cc44fe246dd74a29a52f12f1a7 100755 (executable)
--- a/radiant/radiant_VC9.vcproj
+++ b/radiant/radiant_VC9.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;;&quot;$(SolutionDir)\..\fontconfig-dev_2.8.0-2_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include\freetype2&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\freetype2&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -61,8 +61,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0.lib pangoft2-1.0.lib"\r
-                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib pangoft2-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.2.0\lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
@@ -115,7 +115,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;;&quot;$(SolutionDir)\..\fontconfig-dev_2.8.0-2_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include&quot;;&quot;$(SolutionDir)\..\freetype-dev_2.4.2-1_win32\include\freetype2&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk2\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\gdk-pixbuf-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\include\freetype2&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
@@ -134,8 +134,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0.lib pangoft2-1.0.lib"\r
-                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               AdditionalDependencies="intl.lib user32.lib shell32.lib gdi32.lib comdlg32.lib l_net.lib cmdlib.lib mathlib.lib Wsock32.lib libxml2.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib pangoft2-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;;&quot;$(SolutionDir)\..\gtk2\lib\gtkglext-1.2.0\lib&quot;"\r
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
@@ -996,11 +996,11 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\gtkmisc.h"\r
+                                       RelativePath="..\..\src\gtk+\gtk\gtkmisc.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\src\gtk+\gtk\gtkmisc.h"\r
+                                       RelativePath=".\gtkmisc.h"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -2412,10 +2412,6 @@
                <Filter\r
                        Name="Misc"\r
                        >\r
-                       <File\r
-                               RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\src\gtk+\gtk\makefile.msc"\r
                                >\r
@@ -2428,6 +2424,10 @@
                                RelativePath="..\..\src\gtk+\gdk\makefile.msc"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <File\r
                        RelativePath="..\setup\changelog.txt"\r

diff --git a/tools/quake3/q3map2/q3map2_VC9.vcproj b/tools/quake3/q3map2/q3map2_VC9.vcproj
index 989e00c66ec9400e0855f74a7a6c24da11a8f5c6..2c4799bff1fc4b2c7f5ec650d751740cf4c70fa2 100755 (executable)
--- a/tools/quake3/q3map2/q3map2_VC9.vcproj
+++ b/tools/quake3/q3map2/q3map2_VC9.vcproj
@@ -62,6 +62,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalOptions="/NODEFAULTLIB:MSVCRT"\r
                                AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libjpeg.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib"\r
                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\jpeg-6b&quot;;&quot;$(SolutionDir)\..\libxml2\lib&quot;;&quot;$(SolutionDir)\..\gtk2\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
                                GenerateDebugInformation="true"\r