Mercurial > fife-parpg
diff build/linux2-config.py @ 618:b5e7e14004a4
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 |
line wrap: on
line diff
--- a/build/linux2-config.py Mon Sep 27 21:18:24 2010 +0000 +++ b/build/linux2-config.py Tue Sep 28 17:43:36 2010 +0000 @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- # #################################################################### -# Copyright (C) 2005-2009 by the FIFE team -# http://www.fifengine.de +# Copyright (C) 2005-2010 by the FIFE team +# http://www.fifengine.net # This file is part of FIFE. # # FIFE is free software; you can redistribute it and/or @@ -43,6 +43,8 @@ env.AppendENVPath('LD_RUN_PATH', os.path.join('..', '..', '..', extlibpath)) + env.AppendUnique(CXXFLAGS=["-DPNG_SKIP_SETJMP_CHECK"]) + return env def addExtras(env, opengl):