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

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

Revision: 546
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=546&view=rev
Author:   andy_miller
Date:     2008-01-15 07:03:59 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
Fixes for Linux Caelum and OgreAL 

Modified Paths:
--------------
    trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h	2008-01-15 06:54:21 UTC (rev 545)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h	2008-01-15 15:03:59 UTC (rev 546)
@@ -25,7 +25,7 @@
 #include "Ogre.h"
 
 // Define the dll export qualifier if compiling for Windows
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+// #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
 // 	#ifdef CAELUM_LIB
 // 		#define DllExport __declspec (dllexport)
 // 	#else
@@ -37,7 +37,7 @@
 // 	#endif
 // #else
 	#define DllExport
-#endif
+// #endif
 
 // Define the version code
 #define CAELUM_VERSION_MAIN 0

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-01-15 06:54:21 UTC (rev 545)
+++ trunk/python-ogre/environment.py	2008-01-15 15:03:59 UTC (rev 546)
@@ -1081,7 +1081,8 @@
         [0, "tar zxf " + os.path.join(downloadPath, "libogg-1.1.3.tar.gz"), ''],
         [0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''],
         [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")],
-        [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
+        [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")],
+        [0, "sed --in-place -s 's|( ALCvoid )|()|' alc.h",os.path.join(os.getcwd(),"openal-0.0.8","common", "include", "AL")],
         [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
         [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
         ]


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