Mercurial > fife-parpg

comparison build/linux2-config.py @ 618:b5e7e14004a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removing libpng from ext and removed the libpng build command from the ext build target. Added the -DPNG_SKIP_SETJMP_CHECK flag to the linux2-config.py build config file. This should allow users to use their local copy of libpng rather than relying on the libpng in ext. Users should probably clean out their <fife>/etc/install/* directories and re-run 'scons ext'. Tested on ubuntu 10.04
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 28 Sep 2010 17:43:36 +0000
parents 68aa65e5bd9c
children 20d1d695bf47
comparison
equal deleted inserted replaced
617:69ef061db940 618:b5e7e14004a4
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 2
3 # #################################################################### 3 # ####################################################################
4 # Copyright (C) 2005-2009 by the FIFE team 4 # Copyright (C) 2005-2010 by the FIFE team
5 # http://www.fifengine.de 5 # http://www.fifengine.net
6 # This file is part of FIFE. 6 # This file is part of FIFE.
7 # 7 #
8 # FIFE is free software; you can redistribute it and/or 8 # FIFE is free software; you can redistribute it and/or
9 # modify it under the terms of the GNU Lesser General Public 9 # modify it under the terms of the GNU Lesser General Public
10 # License as published by the Free Software Foundation; either 10 # License as published by the Free Software Foundation; either
41 env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'), 41 env.Append(LIBPATH = [os.path.join('/', 'opt', 'lib'),
42 extlibpath]) 42 extlibpath])
43 43
44 env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath)) 44 env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath))
45 45
46 env.AppendUnique(CXXFLAGS=["-DPNG_SKIP_SETJMP_CHECK"])
47
46 return env 48 return env
47 49
48 def addExtras(env, opengl): 50 def addExtras(env, opengl):
49 env.Append(LIBS = pythonversion) 51 env.Append(LIBS = pythonversion)
50 52