From: <eli...@us...> - 2008-01-21 21:38:33
|
Revision: 2941 http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2941&view=rev Author: elias_naur Date: 2008-01-21 13:38:29 -0800 (Mon, 21 Jan 2008) Log Message: ----------- Removed devil and fmod support. yay. Modified Paths: -------------- trunk/LWJGL/build.xml Removed Paths: ------------- trunk/LWJGL/doc/3rdparty/openil_license.txt trunk/LWJGL/platform_build/linux_ant/build_devil.xml trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml trunk/LWJGL/platform_build/macosx_ant/build_devil.xml trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml trunk/LWJGL/platform_build/windows_ant/build_devil.xml trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml trunk/LWJGL/src/java/org/lwjgl/devil/ trunk/LWJGL/src/java/org/lwjgl/fmod3/ trunk/LWJGL/src/java/org/lwjgl/test/applet/Optional.java trunk/LWJGL/src/java/org/lwjgl/test/devil/ trunk/LWJGL/src/java/org/lwjgl/test/fmod3/ trunk/LWJGL/src/native/common/devil/ trunk/LWJGL/src/native/common/fmod3/ Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2008-01-21 21:27:03 UTC (rev 2940) +++ trunk/LWJGL/build.xml 2008-01-21 21:38:29 UTC (rev 2941) @@ -24,10 +24,8 @@ <fileset id="lwjgl.fileset" dir="${lwjgl.bin}"> <include name="org/**/*" /> <exclude name="org/lwjgl/d3d/**" /> - <exclude name="org/lwjgl/fmod3/**" /> <exclude name="org/lwjgl/test/**" /> <exclude name="org/lwjgl/util/**" /> - <exclude name="org/lwjgl/devil/**" /> <exclude name="org/lwjgl/examples/**" /> </fileset> @@ -62,18 +60,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}"> - <exclude name="**.*"/> - <include name="org/lwjgl/devil/**"/> - </fileset> - <!-- Files to include in the lwjgl_applet.jar file --> <fileset id="lwjgl_applet.fileset" dir="${lwjgl.bin}"> <exclude name="**.*"/> @@ -108,15 +94,6 @@ <include name="jinput-raw.dll" /> </patternset> - <!-- Files to include in win32 optional package --> - <patternset id="lwjgl-win32_optional.fileset"> - <include name="lwjgl-fmod3.dll" /> - <include name="lwjgl-devil.dll" /> - <include name="DevIL.dll" /> - <include name="ILU.dll" /> - <include name="ILUT.dll" /> - </patternset> - <!-- Files to include in linux, glibc2.3 package --> <patternset id="lwjgl-linux.fileset"> <include name="liblwjgl*.so" /> @@ -124,15 +101,6 @@ <include name="libjinput-linux.so" /> </patternset> - <!-- Files to include in linux optional, glibc2.3 package --> - <patternset id="lwjgl-linux_optional.fileset"> - <include name="liblwjgl-fmod3.so" /> - <include name="liblwjgl-devil.so" /> - <include name="libIL.so" /> - <include name="libILU.so" /> - <include name="libILUT.so" /> - </patternset> - <!-- Files to include in mac os x package --> <patternset id="lwjgl-macosx.fileset"> <include name="liblwjgl.jnilib" /> @@ -141,15 +109,6 @@ <include name="libjinput-osx-legacy.jnilib" /> </patternset> - <!-- Files to include in mac os x optional package --> - <patternset id="lwjgl-macosx_optional.fileset"> - <include name="liblwjgl-fmod3.jnilib" /> - <include name="liblwjgl-devil.jnilib" /> - <include name="libIL.dylib" /> - <include name="libILU.dylib" /> - <include name="libILUT.dylib" /> - </patternset> - <!-- Files to include in source distribution --> <fileset id="lwjgl.source.fileset" dir="."> <include name="build.xml" /> @@ -160,40 +119,18 @@ <!-- files in the base package --> <patternset id="lwjgl_base"> <include name="**" /> - <exclude name="jar/lwjgl_fmod3.jar" /> - <exclude name="jar/lwjgl_devil.jar" /> - <exclude name="native/win32/lwjgl-*.dll" /> - <exclude name="native/win32/DevIL.dll" /> - <exclude name="native/win32/ILU.dll" /> - <exclude name="native/win32/ILUT.dll" /> - <exclude name="native/linux/libIL*.so" /> - <exclude name="native/linux/liblwjgl-*.so" /> - <exclude name="native/macosx/libIL*.dylib" /> - <exclude name="native/macosx/liblwjgl-*.jnilib" /> <exclude name="res/ILtest.*" /> <exclude name="res/Missing_you.mod" /> <exclude name="res/phero*.*" /> - <exclude name="doc/3rdparty/openil_license.txt" /> </patternset> <!-- files in the optional package --> <patternset id="lwjgl_optional"> - <include name="jar/lwjgl_fmod3.jar" /> - <include name="jar/lwjgl_devil.jar" /> - <include name="native/win32/lwjgl-*.dll" /> - <include name="native/win32/DevIL.dll" /> - <include name="native/win32/ILU.dll" /> - <include name="native/win32/ILUT.dll" /> - <include name="native/linux/libIL*.so" /> - <include name="native/linux/liblwjgl-*.so" /> - <include name="native/macosx/libIL*.dylib" /> - <include name="native/macosx/liblwjgl-*.jnilib" /> <include name="res/**" /> <exclude name="res/logo/**" /> <exclude name="res/spaceinvaders/**" /> <exclude name="res/*.wav" /> <exclude name="res/*.xpm" /> - <include name="doc/3rdparty/openil_license.txt" /> <include name="doc/CREDITS" /> <include name="doc/LICENSE" /> <include name="doc/README" /> @@ -211,16 +148,6 @@ <srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/> </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 property="lwjgl.devil.built" targetfile="${lwjgl.lib}/win32/lwjgl-devil.dll" > - <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c"/> - <srcfiles dir= "${lwjgl.src.native}/common/devil" includes="*.c"/> - </uptodate> - <!-- ================================================================== --> <!-- Everything below this line is targets. --> <!-- Do not modify, unless you know what you're doing --> @@ -232,8 +159,6 @@ <target name="-initialize"> <mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" /> <mkdir dir="${lwjgl.bin}/lwjgl" taskname="initialiazing bin folder" /> - <mkdir dir="${lwjgl.bin}/devil" taskname="initialiazing bin folder" /> - <mkdir dir="${lwjgl.bin}/fmod3" taskname="initialiazing bin folder" /> <mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder" /> <mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder" /> <mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" /> @@ -310,6 +235,7 @@ <!-- Create ONLY the jar archives --> <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars"> + <!-- <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">--> <!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">--> <move todir="libs/"> <fileset dir="${lwjgl.temp}/jar"> @@ -346,22 +272,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" /> - <manifest> - <attribute name="Sealed" value="true"/> - </manifest> - </jar> - - <!-- Create lwjgl_devil.jar --> - <jar destfile="${lwjgl.temp}/jar/lwjgl_devil.jar" taskname="lwjgl_devil.jar"> - <fileset refid="lwjgl_devil.fileset" /> - <manifest> - <attribute name="Sealed" value="false"/> - </manifest> - </jar> </target> <target name="applettest" depends="applet"> @@ -420,8 +330,6 @@ <jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar"> <fileset dir="${lwjgl.lib}/win32"> <patternset refid="lwjgl-win32.fileset"/> - <patternset refid="lwjgl-win32_optional.fileset"/> - <include name="fmod.dll"/> </fileset> </jar> <signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> @@ -429,8 +337,6 @@ <jar destfile="applet/linux_natives.jar" taskname="linux_natives.jar"> <fileset dir="${lwjgl.lib}/linux"> <patternset refid="lwjgl-linux.fileset"/> - <patternset refid="lwjgl-linux_optional.fileset"/> - <include name="libfmod.so"/> </fileset> </jar> <signjar jar="applet/linux_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> @@ -438,8 +344,6 @@ <jar destfile="applet/macosx_natives.jar" taskname="macosx_natives.jar"> <fileset dir="${lwjgl.lib}/macosx"> <patternset refid="lwjgl-macosx.fileset"/> - <patternset refid="lwjgl-macosx_optional.fileset"/> - <include name="libfmod.dylib"/> </fileset> </jar> <signjar jar="applet/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> @@ -460,8 +364,6 @@ <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/> <copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/> <copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/> - <copy file="${lwjgl.lib}/lwjgl_fmod3.jar" todir="applet"/> - <copy file="${lwjgl.lib}/lwjgl_devil.jar" todir="applet"/> <copy file="${lwjgl.lib}/jinput.jar" todir="applet"/> <zip destfile="applet/res.jar"> <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/> @@ -469,8 +371,6 @@ <signjar jar="applet/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> <signjar jar="applet/jinput.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> <signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> - <signjar jar="applet/lwjgl_fmod3.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> - <signjar jar="applet/lwjgl_devil.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> </target> <!-- Distributes files --> @@ -483,19 +383,16 @@ <copy todir="${lwjgl.temp}/native/win32"> <fileset dir="${lwjgl.lib}/win32"> <patternset refid="lwjgl-win32.fileset" /> - <patternset refid="lwjgl-win32_optional.fileset" /> </fileset> </copy> <copy todir="${lwjgl.temp}/native/linux"> <fileset dir="${lwjgl.lib}/linux"> <patternset refid="lwjgl-linux.fileset" /> - <patternset refid="lwjgl-linux_optional.fileset" /> </fileset> </copy> <copy todir="${lwjgl.temp}/native/macosx"> <fileset dir="${lwjgl.lib}/macosx"> <patternset refid="lwjgl-macosx.fileset" /> - <patternset refid="lwjgl-macosx_optional.fileset" /> </fileset> </copy> @@ -506,13 +403,6 @@ </zipfileset> </zip> - <!-- create optional package --> - <zip destfile="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip"> - <zipfileset dir="${lwjgl.temp}" prefix="lwjgl_optional-${lwjgl.version}/"> - <patternset refid="lwjgl_optional"/> - </zipfileset> - </zip> - <!-- create applet package --> <zip destfile="${lwjgl.dist}/lwjgl_applet-${lwjgl.version}.zip"> <zipfileset dir="." prefix="lwjgl_applet-${lwjgl.version}/"> @@ -547,8 +437,6 @@ </javac> <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/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> <!-- Generates the native headers from source files --> @@ -608,18 +496,6 @@ <class name="org.lwjgl.opengl.GLContext" /> <class name="org.lwjgl.opengl.Pbuffer" /> </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"> - <class name="org.lwjgl.devil.ILNative" /> - </javah> </target> <!-- Creates the Javadoc --> @@ -670,7 +546,7 @@ <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> <arg path="${lwjgl.src.native}/generated"/> - <!--<arg value="-Ageneratechecks"/>--> + <arg value="-Ageneratechecks"/> <arg value="-Acontextspecific"/> <arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/> <fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/> @@ -706,7 +582,7 @@ </apply> </target> - <target name="compile_native_all" depends="compile_native, compile_native_optional" description="Compiles the native files"/> + <target name="compile_native_all" depends="compile_native" description="Compiles the native files"/> <!-- Compiles the native files --> <target name="compile_native" depends="headers" description="Compiles the native files"> @@ -727,37 +603,12 @@ <antcall target="-compile_native_macosx" /> </target> - <target name="compile_native_optional" depends="headers" description="Compiles the native files"> - <!-- check each platform, and run their build target --> - <condition property="lwjgl.platform.windows"> - <os family="windows" /> - </condition> - <antcall target="-compile_native_win32_optional" /> - - <condition property="lwjgl.platform.linux"> - <os name="Linux" /> - </condition> - <antcall target="-compile_native_linux_optional" /> - <condition property="lwjgl.platform.macosx"> - <os name="Mac OS X" /> - </condition> - <antcall target="-compile_native_macosx_optional" /> - </target> - <!-- Compiles LWJGL on Win32 platforms --> <target name="-compile_native_win32" if="lwjgl.platform.windows"> <ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/> <copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/win32"/> </target> - <target name="-compile_native_win32_optional" if="lwjgl.platform.windows"> - <ant antfile="platform_build/windows_ant/build_fmod3.xml" inheritAll="false"/> - <copy file="${lwjgl.bin}/fmod3/lwjgl-fmod3.dll" todir="${lwjgl.lib}/win32"/> - - <ant antfile="platform_build/windows_ant/build_devil.xml" inheritAll="false"/> - <copy file="${lwjgl.bin}/devil/lwjgl-devil.dll" todir="${lwjgl.lib}/win32"/> - </target> - <!-- Compiles LWJGL on Linux platforms --> <target name="-compile_native_linux" if="lwjgl.platform.linux"> <ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/> @@ -766,32 +617,11 @@ </copy> </target> - <target name="-compile_native_linux_optional" if="lwjgl.platform.linux"> - <ant antfile="platform_build/linux_ant/build_fmod3.xml" inheritAll="false"/> - <copy file="${lwjgl.bin}/fmod3/liblwjgl-fmod3.so" todir="${lwjgl.lib}/linux"/> - - <ant antfile="platform_build/linux_ant/build_devil.xml" inheritAll="false"/> - <copy file="${lwjgl.bin}/devil/liblwjgl-devil.so" todir="${lwjgl.lib}/linux"/> - </target> - <target name="-compile_native_macosx" if="lwjgl.platform.macosx"> <ant antfile="platform_build/macosx_ant/build.xml" inheritAll="false"/> <copy file="${lwjgl.bin}/lwjgl/liblwjgl.jnilib" todir="${lwjgl.lib}/macosx"/> </target> - <!-- Compiles LWJGL on Mac OS X platforms --> - <target name="-compile_native_macosx_optional" if="lwjgl.platform.macosx"> - - <!-- check for required properties --> - <property environment="env"/> - <fail message="Missing FMOD path environment property" unless="env.FMOD"/> - <ant antfile="platform_build/macosx_ant/build_fmod3.xml" inheritAll="false"/> - <ant antfile="platform_build/macosx_ant/build_devil.xml" inheritAll="false"/> - <copy file="${lwjgl.bin}/fmod3/liblwjgl-fmod3.jnilib" todir="${lwjgl.lib}/macosx"/> - <copy file="${lwjgl.bin}/devil/liblwjgl-devil.jnilib" todir="${lwjgl.lib}/macosx"/> - </target> - - <target name="webstart_demo" depends="jars"> <antcall target="-webstart_demo"> <param name="keystore" value="applet/lwjglkeystore"/> @@ -818,22 +648,14 @@ <!-- unzip common files --> <unzip src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> - <unzip src="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> <!-- move files to unified structure --> <move todir="${lwjgl.temp}/jnlp/temp"> <fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/"> <include name="**"/> </fileset> - <fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl_optional-${lwjgl.version}/"> - <include name="**"/> - </fileset> </move> - <!-- copy fmod dependent files --> - <copy file="${lwjgl.lib}/win32/fmod.dll" tofile="${lwjgl.temp}/jnlp/temp/native/win32/fmod.dll"/> - <copy file="${lwjgl.lib}/linux/libfmod.so" tofile="${lwjgl.temp}/jnlp/temp/native/linux/libfmod.so"/> - <!-- move relevant files to root --> <move todir="${lwjgl.temp}/jnlp/" flatten="true"> <fileset dir="${lwjgl.temp}/jnlp/temp"> @@ -851,8 +673,6 @@ <!-- sign 'em --> <signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> <signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> <signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> <signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/> Deleted: trunk/LWJGL/doc/3rdparty/openil_license.txt =================================================================== --- trunk/LWJGL/doc/3rdparty/openil_license.txt 2008-01-21 21:27:03 UTC (rev 2940) +++ trunk/LWJGL/doc/3rdparty/openil_license.txt 2008-01-21 21:38:29 UTC (rev 2941) @@ -1,506 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - - - Deleted: trunk/LWJGL/platform_build/linux_ant/build_devil.xml =================================================================== --- trunk/LWJGL/platform_build/linux_ant/build_devil.xml 2008-01-21 21:27:03 UTC (rev 2940) +++ trunk/LWJGL/platform_build/linux_ant/build_devil.xml 2008-01-21 21:38:29 UTC (rev 2941) @@ -1,51 +0,0 @@ -<?xml version="1.0"?> - -<project name="devil" basedir="../../bin/devil" default="compile"> - <property name="native" location="../../src/native"/> - <property name="libname32" value="liblwjgl-devil.so"/> - <property name="libname64" value="liblwjgl64-devil.so"/> - <property name="libs32" value="-lpthread"/> - <property name="libs64" value="-lpthread"/> - <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/> - - <target name="clean"> - <delete> - <fileset dir="." includes="*.o"/> - <fileset dir="." includes="*.so"/> - </delete> - </target> - - <target name="compile"> - <exec executable="uname" outputproperty="hwplatform"> - <arg value="-m"/> - </exec> - <condition property="libs" value="${libs64}" else="${libs32}"> - <equals arg1="${hwplatform}" arg2="x86_64"/> - </condition> - <condition property="libname" value="${libname64}" else="${libname32}"> - <equals arg1="${hwplatform}" arg2="x86_64"/> - </condition> - <property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/> - <apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true"> - <arg line="${cflags}"/> - <arg value="-I${java.home}/../include"/> - <arg value="-I${java.home}/../include/linux"/> - <arg value="-I${java.home}/include"/> - <arg value="-I${java.home}/include/linux"/> - <arg value="-I${native}/common"/> - <arg value="-I${native}/common/devil"/> - <mapper type="glob" from="*.c" to="*.o"/> - <fileset dir="${native}/common" includes="*common*.c"/> - <fileset dir="${native}/common/devil" includes="*.c"/> - </apply> - <apply dir="." parallel="true" executable="cc" failonerror="true"> - <srcfile/> - <arg line="${linker_flags}"/> - <fileset dir="." includes="*.o"/> - </apply> - <apply dir="." parallel="true" executable="strip" failonerror="true"> - <fileset file="${libname}"/> - </apply> - </target> -</project> - Deleted: trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml =================================================================== --- trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml 2008-01-21 21:27:03 UTC (rev 2940) +++ trunk/LWJGL/platform_build/linux_ant/build_fmod3.xml 2008-01-21 21:38:29 UTC (rev 2941) @@ -1,56 +0,0 @@ -<?xml version="1.0"?> - -<project name="fmod3" basedir="../../bin/fmod3" default="compile"> - <property name="native" location="../../src/native"/> - <property environment="env"/> - <property name="fmod.home" location="${env.FMOD}"/> - <property name="libname32" value="liblwjgl-fmod3.so"/> - <property name="libname64" value="liblwjgl64-fmod3.so"/> - <property name="libs32" value="-lpthread"/> - <property name="libs64" value="-lpthread"/> - <property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/> - - <fail message="Missing FMOD path environment property" unless="env.FMOD"/> - - <target name="clean"> - <delete> - <fileset dir="." includes="*.o"/> - <fileset dir="." includes="*.so"/> - </delete> - </target> - - <target name="compile"> - <exec executable="uname" outputproperty="hwplatform"> - <arg value="-m"/> - </exec> - <condition property="libs" value="${libs64}" else="${libs32}"> - <equals arg1="${hwplatform}" arg2="x86_64"/> - </condition> - <condition property="libname" value="${libname64}" else="${libname32}"> - <equals arg1="${hwplatform}" arg2="x86_64"/> - </condition> - <property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/> - <apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true"> - <arg line="${cflags}"/> - <arg value="-I${java.home}/../include"/> - <arg value="-I${java.home}/../include/linux"/> - <arg value="-I${java.home}/include"/> - <arg value="-I${java.home}/include/linux"/> - <arg value="-I${fmod.home}/api/inc"/> - <arg value="-I${native}/common"/> - <arg value="-I${native}/common/fmod3"/> - <mapper type="glob" from="*.c" to="*.o"/> - <fileset dir="${native}/common" includes="*common*.c"/> - <fileset dir="${native}/common/fmod3" includes="*.c"/> - </apply> - <apply dir="." parallel="true" executable="cc" failonerror="true"> - <srcfile/> - <arg line="${linker_flags}"/> - <fileset dir="." includes="*.o"/> - </apply> - <apply dir="." parallel="true" executable="strip" failonerror="true"> - <fileset file="${libname}"/> - </apply> - </target> -</project> - Deleted: trunk/LWJGL/platform_build/macosx_ant/build_devil.xml =================================================================== --- trunk/LWJGL/platform_build/macosx_ant/build_devil.xml 2008-01-21 21:27:03 UTC (rev 2940) +++ trunk/LWJGL/platform_build/macosx_ant/build_devil.xml 2008-01-21 21:38:29 UTC (rev 2941) @@ -1,81 +0,0 @@ -<?xml version="1.0" ?> -<project name="OS X Native code" basedir="../../bin/devil" default="nativelibrary"> - <property name="native" location="../../src/native"/> - - <target name="init"> - <mkdir dir="ppc"/> - <mkdir dir="intel"/> - </target> - - <target name="clean"> - <delete failonerror="false"> - <fileset dir="intel"/> - <fileset dir="ppc"/> - <fileset dir="." includes="liblwjgl-devil.jnilib"/> - <fileset dir="." includes="devil.symbols"/> - </delete> - </target> - - <target name="compile"> - <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}"> - <arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common"/> - <!-- Map from *.m and *.c to .o --> - <mapper type="regexp" from="^(.*)\.(c)" to="\1.o"/> - <fileset dir="${native}/common" includes="common_tools.c"/> - <fileset dir="${native}/common/devil" includes="*.c"/> - </apply> - </target> - - <target name="link"> - <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true"> - <arg line="${linkerflags} -exported_symbols_list ../devil.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/> - <fileset dir="${objdir}" includes="*.o"/> - </apply> - <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true"> - <arg line="-S -X"/> - <fileset dir="." file="${libname}"/> - </apply> - </target> - - <target name="nativelibrary" depends="init"> - <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/> - <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/> - <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/> - <property name="legacy_flags" value="-arch ppc"/> - <antcall target="compile"> - <param name="dstdir" location="intel"/> - <param name="compiler" value="gcc-4.0"/> - <param name="sdkroot" location="${universal_sdkroot}"/> - <param name="cflags" value="${universal_flags}"/> - </antcall> - <antcall target="compile"> - <param name="dstdir" location="ppc"/> - <param name="compiler" value="gcc-3.3"/> - <param name="sdkroot" location="${legacy_sdkroot}"/> - <param name="cflags" value="${legacy_flags}"/> - </antcall> - <exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="devil.symbols" failonerror="true"> - <arg path="intel"/> - </exec> - <antcall target="link"> - <param name="objdir" location="intel"/> - <param name="libname" value="liblwjgl-devil-intel.jnilib"/> - <param name="linker" value="gcc-4.0"/> - <param name="linkerflags" value="${universal_flags}"/> - </antcall> - <antcall target="link"> - <param name="objdir" location="ppc"/> - <param name="libname" value="liblwjgl-devil-ppc.jnilib"/> - <param name="linker" value="gcc-3.3"/> - <param name="linkerflags" value="${legacy_flags}"/> - </antcall> - <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" > - <arg value="-create"/> - <srcfile/> - <arg value="-output"/> - <arg path="liblwjgl-devil.jnilib"/> - <fileset file="ppc/liblwjgl-devil-ppc.jnilib"/> - <fileset file="intel/liblwjgl-devil-intel.jnilib"/> - </apply> - </target> -</project> Deleted: trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml =================================================================== --- trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml 2008-01-21 21:27:03 UTC (rev 2940) +++ trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml 2008-01-21 21:38:29 UTC (rev 2941) @@ -1,86 +0,0 @@ -<?xml version="1.0" ?> -<project name="OS X Native code" basedir="../../bin/fmod3" default="nativelibrary"> - <property environment="env"/> - <property name="native" location="../../src/native"/> - <property name="fmod.home" location="${env.FMOD}"/> - - - <target name="init"> - <mkdir dir="ppc"/> - <mkdir dir="intel"/> - </target> - - <target name="clean"> - <delete failonerror="false"> - <fileset dir="intel"/> - <fileset dir="ppc"/> - <fileset dir="." includes="liblwjgl-fmod3.jnilib"/> - <fileset dir="." includes="fmod3.symbols"/> - </delete> - </target> - - <target name="compile"> - <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}"> - <arg line="${cflags} -O2 -Wall -c -fno-common -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${fmod.home}/api/inc"/> - <!-- Map from *.m and *.c to .o --> - <mapper type="regexp" from="^(.*)\.(c)" to="\1.o"/> - <fileset dir="${native}/common" includes="common_tools.c"/> - <fileset dir="${native}/common/fmod3" includes="*.c"/> - </apply> - </target> - - <target name="link"> - <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true"> - <arg line="${linkerflags} -single_module -exported_symbols_list ../fmod3.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon ${staticlibs}"/> - <fileset dir="${objdir}" includes="*.o"/> - </apply> - <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true"> - <arg line="-S -X"/> - <fileset dir="." file="${libname}"/> - </apply> - </target> - - <target name="nativelibrary" depends="init"> - <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/> - <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/> - <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/> - <property name="legacy_flags" value="-arch ppc"/> - <antcall target="compile"> - <param name="dstdir" location="intel"/> - <param name="compiler" value="gcc-4.0"/> - <param name="sdkroot" location="${universal_sdkroot}"/> - <param name="cflags" value="${universal_flags}"/> - </antcall> - <antcall target="compile"> - <param name="dstdir" location="ppc"/> - <param name="compiler" value="gcc-3.3"/> - <param name="sdkroot" location="${legacy_sdkroot}"/> - <param name="cflags" value="${legacy_flags}"/> - </antcall> - <exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="fmod3.symbols" failonerror="true"> - <arg path="intel"/> - </exec> - <antcall target="link"> - <param name="objdir" location="intel"/> - <param name="libname" value="liblwjgl-fmod3-intel.jnilib"/> - <param name="linker" value="gcc-4.0"/> - <param name="linkerflags" value="${universal_flags}"/> - <param name="staticlibs" value="${fmod.home}/api/lib/libfmodx86.a"/> - </antcall> - <antcall target="link"> - <param name="objdir" location="ppc"/> - <param name="libname" value="liblwjgl-fmod3-ppc.jnilib"/> - <param name="linker" value="gcc-3.3"/> - <param name="linkerflags" value="${legacy_flags}"/> - <param name="staticlibs" value="${fmod.home}/api/lib/libfmod.a"/> - </antcall> - <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" > - <arg value="-create"/> - <srcfile/> - <arg value="-output"/> - <arg path="liblwjgl-fmod3.jnilib"/> - <fileset file="ppc/liblwjgl-fmod3-ppc.jnilib"/> - <fileset file="intel/liblwjgl-fmod3-intel.jnilib"/> - </apply> - </target> -</project> Deleted: trunk/LWJGL/platform_build/windows_ant/build_devil.xml =================================================================== --- trunk/LWJGL/platform_build/windows_ant/build_devil.xml 2008-01-21 21:27:03 UTC (rev 2940) +++ trunk/LWJGL/platform_build/windows_ant/build_devil.xml 2008-01-21 21:38:29 UTC (rev 2941) @@ -1,52 +0,0 @@ -<?xml version="1.0"?> - -<project name="devil" basedir="../../bin/devil" default="compile"> - <property name="native" location="../../src/native"/> - <property environment="env"/> - <property name="sdkhome" location="${env.MSSDK}"/> - <property name="fmodhome" location="${env.FMODHOME}"/> - <property name="dllname" value="lwjgl-devil.dll"/> - - <target name="compile_dir"> - <apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true"> - <arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/> - <arg value="/I${sdkhome}\include"/> - <arg value="/I${java.home}\..\include"/> - <arg value="/I${java.home}\..\include\win32"/> - <arg value="/I${native}\common"/> - <srcfile/> - <fileset dir="${native}/common/devil" includes="*.c"/> - <fileset dir="${native}/common" includes="*common*.c"/> - <mapper type="glob" from="*.c" to="*.obj"/> - </apply> - </target> - - <target name="link"> - <apply dir="." parallel="true" executable="cl" failonerror="true"> - <arg line="/LD /nologo"/> - <srcfile/> - <arg line="/Fe${dllname} /link"/> - <arg value="/LIBPATH:${java.home}\..\lib"/> - <arg value="/LIBPATH:${sdkhome}\lib"/> - <arg value="/OPT:REF"/> - <arg value="/OPT:ICF"/> - <fileset dir="." includes="*.obj"/> - </apply> - </target> - - <target name="clean"> - <delete> - <fileset dir="." includes="*.obj"/> - <fileset dir="." includes="*.dll"/> - <fileset dir="." includes="*.exp"/> - <fileset dir="." includes="*.lib"/> - </delete> - </target> - - <target name="compile" depends="clean"> - <property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/> - <antcall target="compile_dir"/> - <antcall target="link"/> - </target> -</project> - Deleted: trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml =================================================================== --- trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml 2008-01-21 21:27:03 UTC (rev 2940) +++... [truncated message content] |