From 0a65360a887980ea99f8380c877eff02ddc1835a Mon Sep 17 00:00:00 2001 From: rambetter Date: Wed, 15 Dec 2010 06:56:33 +0000 Subject: [PATCH] Backing out r347 and r345. Keeping r346. So, this branch is now r344 with patch r346. DO NOT MERGE THIS CHANGE INTO TRUNK!!!! git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/Rambetter-temp-fixes@349 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- config.py | 38 +++++++++++---------------- contrib/camera/camera.def | 1 + contrib/camera/camera_VC9.vcproj | 6 ++--- plugins/entity/entity.def | 1 + plugins/entity/entity_VC9.vcproj | 2 -- plugins/image/image.def | 1 + plugins/image/image_VC9.vcproj | 1 - plugins/imagepng/imagepng.def | 1 + plugins/imagepng/imagepng_VC9.vcproj | 2 -- plugins/imagepng/plugin.cpp | 14 +++++----- plugins/map/map.def | 3 ++- plugins/map/map_VC9.vcproj | 2 -- plugins/mapxml/mapxml.def | 1 + plugins/mapxml/mapxml_VC9.vcproj | 2 -- plugins/model/model.def | 1 + plugins/model/model_VC9.vcproj | 2 -- plugins/shaders/shaders.def | 1 + plugins/shaders/shaders_VC9.vcproj | 2 -- plugins/surface/surface.def | 1 + plugins/surface/surface_VC9.vcproj | 6 ++--- plugins/vfspk3/vfspk3.def | 1 + plugins/vfspk3/vfspk3_VC9.vcproj | 2 -- radiant/file.cpp | 2 +- radiant/gtkdlgs.cpp | 2 +- radiant/mainframe.cpp | 2 +- radiant/preferences.cpp | 10 +++---- radiant/radiant_VC9.vcproj | 20 +++++++------- tools/quake3/q3map2/q3map2_VC9.vcproj | 1 - 28 files changed, 53 insertions(+), 75 deletions(-) diff --git a/config.py b/config.py index 5ae584be..e91e9f1f 100644 --- 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 ) ) diff --git a/contrib/camera/camera.def b/contrib/camera/camera.def index ddec12c7..6a597438 100644 --- a/contrib/camera/camera.def +++ b/contrib/camera/camera.def @@ -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 diff --git a/contrib/camera/camera_VC9.vcproj b/contrib/camera/camera_VC9.vcproj index bf1b24cd..e10dbd77 100755 --- a/contrib/camera/camera_VC9.vcproj +++ b/contrib/camera/camera_VC9.vcproj @@ -40,7 +40,7 @@ #define X_OK 0 @@ -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, "\n diff --git a/tools/quake3/q3map2/q3map2_VC9.vcproj b/tools/quake3/q3map2/q3map2_VC9.vcproj index 2c4799bf..989e00c6 100755 --- a/tools/quake3/q3map2/q3map2_VC9.vcproj +++ b/tools/quake3/q3map2/q3map2_VC9.vcproj @@ -62,7 +62,6 @@ />