ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* fixed linkage of imagepng lib

Browse source 
* fixed prtview compilation (missing header)

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@230 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
mattn 2008-03-19 07:15:04 +00:00
parent d4c6db46c7
commit 5685756beb
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConscript.module
View file

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

4
config.py
View file

@ -183,7 +183,7 @@ class Config:
else: else:
self.emit_q3map2() 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['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 +226,8 @@ 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 ( useZ ):
env.Append( LIBS = 'z' )
env.Append( CFLAGS = baseflags ) env.Append( CFLAGS = baseflags )
env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] ) env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )

1
contrib/prtview/AboutDialog.cpp
View file

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