Backing out r347 and r345. Keeping r346.
authorrambetter <rambetter>
Wed, 15 Dec 2010 06:56:33 +0000 (06:56 +0000)
committerrambetter <rambetter>
Wed, 15 Dec 2010 06:56:33 +0000 (06:56 +0000)
So, this branch is now r344 with patch r346.
DO NOT MERGE THIS CHANGE INTO TRUNK!!!!

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@349 8a3a26a2-13c4-0310-b231-cf6edde360e5

28 files changed:
config.py
contrib/camera/camera.def
contrib/camera/camera_VC9.vcproj
plugins/entity/entity.def
plugins/entity/entity_VC9.vcproj
plugins/image/image.def
plugins/image/image_VC9.vcproj
plugins/imagepng/imagepng.def
plugins/imagepng/imagepng_VC9.vcproj
plugins/imagepng/plugin.cpp
plugins/map/map.def
plugins/map/map_VC9.vcproj
plugins/mapxml/mapxml.def
plugins/mapxml/mapxml_VC9.vcproj
plugins/model/model.def
plugins/model/model_VC9.vcproj
plugins/shaders/shaders.def
plugins/shaders/shaders_VC9.vcproj
plugins/surface/surface.def
plugins/surface/surface_VC9.vcproj
plugins/vfspk3/vfspk3.def
plugins/vfspk3/vfspk3_VC9.vcproj
radiant/file.cpp
radiant/gtkdlgs.cpp
radiant/mainframe.cpp
radiant/preferences.cpp
radiant/radiant_VC9.vcproj
tools/quake3/q3map2/q3map2_VC9.vcproj

index 5ae584b..e91e9f1 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-5.zip'
+                       depsfile = 'GtkR-deps-1.6-4.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,37 +291,28 @@ 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/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/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/bin/libpangocairo-1.0-0.dll',
                                        'gtk2/bin/libpangowin32-1.0-0.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',                                        
+                                       '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',
                                         ]:
                                         cmd = [ 'cp', '-v', os.path.join( srcdir, f ), 'install' ]
                                         print( repr( cmd ) )
@@ -329,6 +320,9 @@ 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 ) )
index ddec12c..6a59743 100644 (file)
@@ -1,6 +1,7 @@
 ; camera.def : Declares the module parameters for the DLL.
 
 LIBRARY      "CAMERA"
+DESCRIPTION  'CAMERA Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index bf1b24c..e10dbd7 100755 (executable)
@@ -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\gdk-pixbuf-2.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)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                        />\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)\..\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
+                               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
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index b6ccf57..6c40d04 100644 (file)
@@ -1,6 +1,7 @@
 ; entity.def : Declares the module parameters for the DLL.
 
 LIBRARY      "ENTITY"
+DESCRIPTION  'ENTITY Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index 2206d77..ae78d29 100755 (executable)
                        />\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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index 26d413c..7763585 100644 (file)
@@ -1,6 +1,7 @@
 ; image.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Image"
+DESCRIPTION  'Image Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index d5f78f6..965512a 100755 (executable)
@@ -61,7 +61,6 @@
                        />\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
index 64f59c0..cc87688 100644 (file)
@@ -1,6 +1,7 @@
 ; imagepng.def : Declares the module parameters for the DLL.
 
 LIBRARY      "IMAGEPNG"
+DESCRIPTION  'IMAGEPNG Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index 2541928..49ed153 100755 (executable)
                        />\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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index fda3e6f..5d8bba7 100644 (file)
@@ -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, NULL,
+    (PNG_LIBPNG_VER_STRING, png_voidp_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,
-      NULL, NULL);
+      png_infopp_NULL, png_infopp_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,
-      NULL);
+      png_infopp_NULL);
     g_FuncTable.m_pfnSysPrintf ("libpng error: png_create_info_struct (end_info)\n");
     return;
   }
@@ -187,10 +187,8 @@ 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 was renamed to png_set_expand_gray_1_2_4_to_8
-    png_set_expand_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(png_ptr);
 
   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
     png_set_tRNS_to_alpha(png_ptr);
@@ -236,7 +234,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, NULL);
+  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
 
   free(row_pointers);
   g_FileSystemTable.m_pfnFreeFile (fbuffer);
index 3f16e0e..80a9c86 100644 (file)
@@ -1,6 +1,7 @@
 ; mapq3.def : Declares the module parameters for the DLL.
 
-LIBRARY      "MAP"
+LIBRARY      "MAPQ3"
+DESCRIPTION  'MAPQ3 Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index 52617f0..f7d7c89 100755 (executable)
                        />\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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index 5835ac8..feca297 100644 (file)
@@ -1,6 +1,7 @@
 ; mapxml.def : Declares the module parameters for the DLL.
 
 LIBRARY      "MAPXML"
+DESCRIPTION  'MAPXML Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index 82e793b..ab492ec 100755 (executable)
                        />\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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index 7f3bb9e..01cee0f 100644 (file)
@@ -1,6 +1,7 @@
 ; model.def : Declares the module parameters for the DLL.
 
 LIBRARY      "MODEL"
+DESCRIPTION  'MODEL Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index 3faf992..3274786 100755 (executable)
                        />\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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index 9d8e0b8..3f3b6a1 100644 (file)
@@ -1,6 +1,7 @@
 ; shaders.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Shaders"
+DESCRIPTION  'Shaders Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index d8fc96a..6741531 100755 (executable)
                        />\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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index 7304330..23328e4 100644 (file)
@@ -1,6 +1,7 @@
 ; surface.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SURFACE"
+DESCRIPTION  'SURFACE Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index 9f10e5a..95bc261 100755 (executable)
@@ -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)\..\gtk2\include\gdk-pixbuf-2.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)\..\libxml2\include&quot;"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                        />\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)\..\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
+                               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
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index aa41465..d4c34e7 100644 (file)
@@ -1,6 +1,7 @@
 ; vfspk3.def : Declares the module parameters for the DLL.
 
 LIBRARY      "VFSPK3"
+DESCRIPTION  'VFSPK3 Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
index 24b06b9..6255ece 100755 (executable)
                        />\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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                                TargetMachine="1"\r
index b0c66ed..5d051ca 100644 (file)
@@ -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()
index 43ebe40..d87f291 100644 (file)
@@ -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)
       {
index 7f7dba2..493520f 100644 (file)
@@ -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 *b = selected_brushes.next;
+       brush_t *b2, *b = selected_brushes.next;
        entity_t * e;
        if (b != &selected_brushes)
        {
index f44aca8..9a71c25 100644 (file)
@@ -40,10 +40,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "gtkmisc.h"
 
 #ifdef _WIN32
-#undef fprintf
-#endif
-
-#ifdef _WIN32
 #include <io.h>
 #define X_OK 0
 #include <sys/stat.h>
@@ -3363,7 +3359,7 @@ void CGameInstall::BuildDialog() {
 
 void CGameInstall::Run() {
        ScanGames();
-       if ( m_availGames[0] == GAME_NONE ) {
+       if (m_availGames[0] == GAME_NONE) {
                return;
        }
        if ( DoModal() == IDCANCEL ) {
@@ -3379,8 +3375,8 @@ void CGameInstall::Run() {
        gameFilePath += ".game";
        Sys_Printf( "game file: %s\n", gameFilePath.GetBuffer() );
 
-       FILE * fg = fopen( gameFilePath.GetBuffer(), "w" );
-       if ( fg == NULL ) {
+       FILE *fg = fopen( gameFilePath.GetBuffer(), "w" );
+       if ( fg == NULL || ferror( fg ) ) {
                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" );
index a74076e..403705d 100755 (executable)
@@ -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.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
+                               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
                                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 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
+                               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
                                GenerateDebugInformation="true"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
                        />\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.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
+                               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
                                PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                WarningLevel="3"\r
                        />\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 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
+                               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
                                GenerateDebugInformation="true"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                        Name="Misc"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\glib\makefile.msc"\r
+                               RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\gtk+\gdk\makefile.msc"\r
+                               RelativePath="..\..\src\gtk+\gtk\makefile.msc"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\gtk+\gdk\win32\makefile.msc"\r
+                               RelativePath="..\..\src\glib\makefile.msc"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\gtk+\gtk\makefile.msc"\r
+                               RelativePath="..\..\src\gtk+\gdk\makefile.msc"\r
                                >\r
                        </File>\r
                </Filter>\r
index 2c4799b..989e00c 100755 (executable)
@@ -62,7 +62,6 @@
                        />\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