--- libsrc/lwjgl/build.xml	2006-05-29 18:49:34.000000000 +0200
+++ libsrc/lwjgl/build.xml-gil	2011-06-24 18:01:09.977130155 +0200
@@ -48,11 +48,6 @@
 		<include name="org/lwjgl/util/**" />
 	</fileset>
 
-	<!-- Files to include in the lwjgl_fmod3.jar file -->
-	<fileset id="lwjgl_fmod3.fileset" dir="${lwjgl.bin}">
-		<exclude name="**.*" />
-		<include name="org/lwjgl/fmod3/**" />
-	</fileset>
 	
 	<!-- Files to include in the lwjgl_devil.jar file -->
 	<fileset id="lwjgl_devil.fileset" dir="${lwjgl.bin}">
@@ -80,7 +75,6 @@
 	<!-- Files to include in win32 package -->
 	<patternset id="lwjgl-win32.fileset">
 		<include name="lwjgl.dll" />
-		<include name="lwjgl-fmod3.dll" />
 		<include name="lwjgl-devil.dll" />
 		<include name="lwjgl-audio.dll" />
 
@@ -93,7 +87,6 @@
 	<!-- Files to include in linux, glibc2.3 package -->
 	<patternset id="lwjgl-linux.fileset">
 		<include name="liblwjgl.so" />
-		<include name="liblwjgl-fmod3.so" />
 		<include name="liblwjgl-devil.so" />
 		<include name="liblwjgl-audio.so" />
 		
@@ -106,7 +99,6 @@
 	<!-- Files to include in mac os x package -->
 	<patternset id="lwjgl-macosx.fileset">
 		<include name="liblwjgl.jnilib" />
-		<include name="liblwjgl-fmod3.jnilib" />
 		<include name="liblwjgl-devil.jnilib" />
 		<include name="liblwjgl-audio.jnilib" />
 		
@@ -128,12 +120,7 @@
 	    <srcfiles dir= "${lwjgl.src.native}/common/ext" includes="*.c"/>
 	    <srcfiles dir= "${lwjgl.src.native}/common/ati" includes="*.c"/>
 	    <srcfiles dir= "${lwjgl.src.native}/win32" includes="*.cpp"/>
-	</uptodate>	
-	
-	<uptodate property="lwjgl.fmod.built" targetfile="${lwjgl.lib}/win32/lwjgl-fmod3.dll" >
-	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c"/>
-	    <srcfiles dir= "${lwjgl.src.native}/common/fmod3" includes="*.c"/>
-	</uptodate>	
+	</uptodate>		
 	
 	<uptodate property="lwjgl.devil.built" targetfile="${lwjgl.lib}/win32/lwjgl-devil.dll" >
 	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c"/>
@@ -240,11 +227,6 @@
 		<jar destfile="${lwjgl.temp}/jar/lwjgl_util.jar" taskname="lwjgl_util.jar">
 			<fileset refid="lwjgl_util.fileset" />
 		</jar>
-
-		<!-- Create lwjgl_fmod.jar -->
-		<jar destfile="${lwjgl.temp}/jar/lwjgl_fmod3.jar" taskname="lwjgl_fmod3.jar">
-			<fileset refid="lwjgl_fmod3.fileset" />
-		</jar>
 		
 		<!-- Create lwjgl_devil.jar -->
 		<jar destfile="${lwjgl.temp}/jar/lwjgl_devil.jar" taskname="lwjgl_devil.jar">
@@ -320,7 +302,6 @@
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test" />
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" excludes="org/lwjgl/util/generator/**" source="1.4" target="1.4" taskname="util" />
-		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" source="1.4" target="1.4" taskname="fmod" />
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/devil/**" source="1.4" target="1.4" taskname="devil"/>
 	</target>
 	
@@ -372,13 +353,6 @@
 			<class name="org.lwjgl.audio.vorbis.DataStream" />
 			<class name="org.lwjgl.audio.vorbis.Util" />
 		</javah>
-
-		<!-- fmod -->
-		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/fmod3" force="yes">
-			<class name="org.lwjgl.fmod3.FMOD" />
-			<class name="org.lwjgl.fmod3.FMusic" />
-			<class name="org.lwjgl.fmod3.FSound" />
-		</javah>
 		
 		<!-- devil -->
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/devil" force="yes">
@@ -610,7 +584,6 @@
 		<fail message="Missing FMODHOME path environment property" unless="env.FMODHOME"/>
 		
 		<antcall target="-compile_native_win32_main" />
-		<antcall target="-compile_native_win32_fmod" />
 		<antcall target="-compile_native_win32_devil" />
 	</target>	
 
@@ -622,14 +595,6 @@
 		<move file="platform_build/win32_ms_cmdline/lwjgl.dll" tofile="${lwjgl.lib}/win32/lwjgl.dll"/>
 	</target>
 
-	<target name="-compile_native_win32_fmod" unless="lwjgl.fmod.built">
-		<!-- build fmod -->
-		<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
-			<arg line="/c build-fmod.bat" />
-		</exec>
-		<move file="platform_build/win32_ms_cmdline/lwjgl-fmod3.dll" tofile="${lwjgl.lib}/win32/lwjgl-fmod3.dll"/>
-	</target>
-
 	<target name="-compile_native_win32_devil" unless="lwjgl.devil.built">
 		<!-- build devil -->
 		<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
@@ -644,19 +609,14 @@
 
 		<!-- check for required properties -->
 		<property environment="env"/>
-		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>		
-		<fail message="Missing FMOD path environment property" unless="env.FMOD"/>		
+		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>			
 		
 		<exec executable="make" dir="${lwjgl.src.native}/linux"/>
 		<exec executable="make" dir="${lwjgl.src.native}/common/devil">
 			<arg line="-f Makefile.linux"/>
 		</exec>
-		<exec executable="make" dir="${lwjgl.src.native}/common/fmod3">
-                        <arg line="-f Makefile.linux"/>
-                </exec>
 		<move file="${lwjgl.src.native}/linux/liblwjgl.so" tofile="${lwjgl.lib}/linux/liblwjgl.so" />
 		<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.so" tofile="${lwjgl.lib}/linux/liblwjgl-devil.so" />
-		<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.so" tofile="${lwjgl.lib}/linux/liblwjgl-fmod3.so" />
 	</target>
 
 	<!-- Compiles LWJGL on Mac OS X platforms  -->
@@ -671,12 +631,8 @@
 		<exec executable="make" dir="${lwjgl.src.native}/common/devil">
                         <arg line="-f Makefile.macosx"/>
                 </exec>
-                <exec executable="make" dir="${lwjgl.src.native}/common/fmod3">
-                        <arg line="-f Makefile.macosx"/>
-                </exec>
     		<move file="${lwjgl.src.native}/macosx/liblwjgl.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl.jnilib" />   
 		<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-devil.jnilib" />
-		<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-fmod3.jnilib" />
   </target> 	
 	 
 	<!-- Creates a build of LWJGL directly from CVS -->