[Python-ogre-commit] SF.net SVN: python-ogre: [463] trunk/python-ogre/scripts

[<and...@us...>]

Revision: 463
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=463&view=rev
Author:   andy_miller
Date:     2007-10-25 22:32:14 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
Remove freealut as ogreal no longer requires it
Build FreeImage as part fo the build
Exclude DevIL from the Ogre build

Modified Paths:
--------------
    trunk/python-ogre/scripts/02-ExtractAndPatch.sh
    trunk/python-ogre/scripts/04-BuildBaseLibs.sh
    trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh

Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
===================================================================
--- trunk/python-ogre/scripts/02-ExtractAndPatch.sh	2007-10-25 05:38:36 UTC (rev 462)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh	2007-10-26 05:32:14 UTC (rev 463)
@@ -14,8 +14,7 @@
 tar zxf $DOWNLOADS/CEGUI-0.5.0b.tar.gz
 echo " -- Unpacking OIS"
 tar zxf $DOWNLOADS/ois-1.0RC1.tar.gz
-echo " -- Unpacking FreeImage"
-unzip -q -o $DOWNLOADS/FreeImage393.zip
+
 echo " -- Unpacking Newton"
 tar zxf $DOWNLOADS/newtonLinux-1.53.tar.gz
 echo " -- Unpacking ODE"
@@ -23,9 +22,19 @@
 echo " -- Unpacking OgreAL Support"
 tar zxf $DOWNLOADS/libogg-1.1.3.tar.gz
 tar zxf $DOWNLOADS/libvorbis-1.2.0.tar.gz
-tar zxf $DOWNLOADS/freealut-1.1.0.tar.gz
+## OgreAL doesn't need ALUT anymore
+## tar zxf $DOWNLOADS/freealut-1.1.0.tar.gz
 tar zxf $DOWNLOADS/openal-0.0.8.tar.gz
 
+echo " -- Unpacking and patching FreeImage"
+unzip -q -o $DOWNLOADS/FreeImage393.zip
+pushd FreeImage
+sed --in-place -s 's|/usr/include|\$(DESTINC)|' Makefile.*
+sed --in-place -s 's|/usr/lib|\$(DESTLIB)|' Makefile.*
+sed --in-place -s 's|-o root -g root||' Makefile.*
+sed --in-place -s 's|ldconfig||' Makefile.*
+popd
+
 echo " -- Unpacking CG"
 pushd $ROOT
 echo "Installing Cg"

Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildBaseLibs.sh	2007-10-25 05:38:36 UTC (rev 462)
+++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh	2007-10-26 05:32:14 UTC (rev 463)
@@ -6,6 +6,14 @@
 
 echo " == Building base libraries == "
 #
+# Freeimage 
+#
+pushd FreeImage
+make
+make DESTINC=$PREFIX/include DESTLIB=$PREFIX/lib install # On Freeimage's case, this is the right path
+popd
+
+#
 # zlib as the one included in Ubuntu is buggy
 #
 echo " -- building zzlib --"
@@ -62,7 +70,7 @@
 pushd ogrenew 
 aclocal
 ./bootstrap
-./configure --prefix=$PREFIX --with-gui=Xt
+./configure --prefix=$PREFIX --with-gui=Xt --disable-devil
 make
 make install
 #cd ReferenceApplication

Modified: trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh
===================================================================
--- trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh	2007-10-25 05:38:36 UTC (rev 462)
+++ trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh	2007-10-26 05:32:14 UTC (rev 463)
@@ -50,15 +50,15 @@
 make install
 popd 
 
-echo " -- Building OgreAL - freealut"
-pushd freealut-1.1.0
-./autogen.sh
-./configure  --prefix=$PREFIX
+#echo " -- Building OgreAL - freealut"
+#pushd freealut-1.1.0
+#./autogen.sh
+#./configure  --prefix=$PREFIX
 ## ugly hack as the make files in freealut don't really handle a non standard prefix
-cp $PREFIX/include/AL/* ./include/AL
-make
-make install
-popd 
+#cp $PREFIX/include/AL/* ./include/AL
+#make
+#make install
+#popd 
 
 #
 # Bullet


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.