diff ext/SConscript @ 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 64738befdf3b
children
line wrap: on
line diff
--- a/ext/SConscript	Mon Sep 27 21:18:24 2010 +0000
+++ b/ext/SConscript	Tue Sep 28 17:43:36 2010 +0000
@@ -17,22 +17,9 @@
 		print 'Building failed: guichan'
 		Exit(1)
 
-def build_png(target, source, env):
-	print "======= FIFE EXTERNAL DEPENDENCY BUILD: LIBPNG ======="
-	failure = Execute(Action(['./configure',
-							  'make all-am',
-							  'make install prefix=%s' % installpath,
-							  'make install-data-hook prefix=%s' % installpath],
-		chdir=os.path.join(curpath, 'libpng-1.2.29')))
-	
-	if (failure):
-		print 'Building failed: png'
-		Exit(1)
-
 	
 ext_cmd = env.Command('ext_target',
 					  'install',
 					  [build_guichan,
-					   build_png,
 					   os.chdir(Dir('#').abspath)])
 Alias('ext', ext_cmd)