ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* fixed libpng linkage (2nd try) 

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@231 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
mattn 2008-03-19 07:20:06 +00:00
parent 5685756beb
commit 62a2a92b5c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConscript.module
View File

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

8
config.py
View File

@ -106,8 +106,7 @@ class Config:
'plugins/entity/entity.vcproj', 'plugins/entity/entity.vcproj',
'plugins/image/image.vcproj', 'plugins/image/image.vcproj',
'plugins/model/model.vcproj', 'plugins/model/model.vcproj',
# FIXME: Fix linker flags - xml2, z 'plugins/imagepng/imagepng.vcproj',
# 'plugins/imagepng/imagepng.vcproj',
'plugins/imagewal/imagewal.vcproj', 'plugins/imagewal/imagewal.vcproj',
'plugins/imagem8/imagem8.vcproj', 'plugins/imagem8/imagem8.vcproj',
'plugins/spritemodel/spritemodel.vcproj', 'plugins/spritemodel/spritemodel.vcproj',
@ -183,7 +182,7 @@ class Config:
else: else:
self.emit_q3map2() self.emit_q3map2()
def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False ): def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False, usePNG = False ):
env['CC'] = self.cc env['CC'] = self.cc
env['CXX'] = self.cxx env['CXX'] = self.cxx
( ret, xml2 ) = commands.getstatusoutput( 'xml2-config --cflags' ) ( ret, xml2 ) = commands.getstatusoutput( 'xml2-config --cflags' )
@ -226,6 +225,9 @@ class Config:
env.Append( LINKFLAGS = gtkgllibs.split( ' ' ) ) env.Append( LINKFLAGS = gtkgllibs.split( ' ' ) )
if ( useJPEG ): if ( useJPEG ):
env.Append( LIBS = 'jpeg' ) env.Append( LIBS = 'jpeg' )
if ( usePNG ):
pnglibs = 'png z'
env.Append( LIBS = pnglibs.split( ' ' ) )
if ( useZ ): if ( useZ ):
env.Append( LIBS = 'z' ) env.Append( LIBS = 'z' )