* fixed linkage of imagepng lib

[xonotic/netradiant.git] / config.py

diff --git a/config.py b/config.py
index f6f22b06035eefbd817f8af1b9782efb050613d7..0006de3b41f2252f202e7d7b92e86d54a5726200 100644 (file)
--- a/config.py
+++ b/config.py
@@ -112,6 +112,7 @@ class Config:
                                         'plugins/imagem8/imagem8.vcproj',
                                         'plugins/spritemodel/spritemodel.vcproj',
                                         'plugins/textool/TexTool.vcproj',
+                                       # 'plugins/sample/sample.vcproj',
                                         'plugins/map/map.vcproj',
                                         'plugins/mapxml/mapxml.vcproj',
                                         'plugins/shaders/shaders.vcproj',
@@ -126,11 +127,11 @@ class Config:
                                        # 'contrib/patches/patches.vcproj',
                                        # 'plugins/archivewad/archivewad.vcproj',
 
-                                       # FIXME Doesn't compile cleanly
-                                       # 'contrib/prtview/PrtView.vcproj',
+                                        'contrib/prtview/PrtView.vcproj',
                                         'contrib/hydratoolz/hydratoolz.vcproj',
                                         'contrib/bobtoolz/bobToolz_gtk.vcproj',
                                         'contrib/gtkgensurf/gtkgensurf.vcproj',
+                                        'contrib/ufoai/ufoai.vcproj',
                                         'contrib/bkgrnd2d/bkgrnd2d.vcproj'
                                 ]:
                                ( libpath, libname ) = os.path.split( project )
@@ -182,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' )
@@ -225,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' ] )