* fixed linkage of imagepng lib

* fixed prtview compilation (missing header)

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@230 8a3a26a2-13c4-0310-b231-cf6edde360e5

SConscript.module

@@ -13,6 +13,7 @@ libname = os.path.splitext( libname )[0]
 env = Environment()
 useJPEG = False
 useGtk = False
+useZ = False
 if ( libname == 'image' ):
 	useJPEG = True
 if ( libname == 'surface' ):
@@ -39,8 +40,10 @@ if ( libname == 'model' ):
 	useGtk = True
 if ( libname == 'TexTool' ):
 	useGtk = True
+#if ( libname == 'imagepng' ):
+#	useZ = True
 
-settings.SetupEnvironment( env, config['name'], useGtk = useGtk, useJPEG = useJPEG )
+settings.SetupEnvironment( env, config['name'], useGtk = useGtk, useJPEG = useJPEG, useZ = useZ )
 proj = utils.vcproj( os.path.join( GetLaunchDir(), project ) )
 
 # some filtering. may need to improve that

config.py

@@ -183,7 +183,7 @@ class Config:
 		else:
 			self.emit_q3map2()
 
-	def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False ):
+	def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False ):
 		env['CC'] = self.cc
 		env['CXX'] = self.cxx
 		( ret, xml2 ) = commands.getstatusoutput( 'xml2-config --cflags' )
@@ -226,6 +226,8 @@ class Config:
 			env.Append( LINKFLAGS = gtkgllibs.split( ' ' ) )
 		if ( useJPEG ):
 			env.Append( LIBS = 'jpeg' )
+		if ( useZ ):
+			env.Append( LIBS = 'z' )
 
 		env.Append( CFLAGS = baseflags )
 		env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )

contrib/prtview/AboutDialog.cpp

@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 
 #include "stdafx.h"
-#include "AboutDialog.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW