* fixed linkage of imagepng lib

* fixed prtview compilation (missing header)

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/ZeroRadiant@230 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/SConscript.module b/SConscript.module
index ba7665b567425f8e8649d7a212b0b0254c8a9206..06ac53856d4bd9f6926be3fbb67a51701dc81af0 100644 (file)
--- a/SConscript.module
+++ b/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

diff --git a/config.py b/config.py
index 77dd34bcc06382e1c7e539c7734c69303fa8886b..0006de3b41f2252f202e7d7b92e86d54a5726200 100644 (file)
--- a/config.py
+++ b/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' ] )

diff --git a/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp
index 1bf834d21b5d6b63d6222ee3e2a931592d255d63..1bf0b99e491e4d386a83c0aaa0165a3c24547acb 100644 (file)
--- a/contrib/prtview/AboutDialog.cpp
+++ b/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