Optimize build configurations
This commit is contained in:
parent
4f7fee2ed4
commit
0b89143608
18
build.xml
18
build.xml
|
@ -375,12 +375,6 @@
|
||||||
</javac>
|
</javac>
|
||||||
</target>-->
|
</target>-->
|
||||||
|
|
||||||
<target name="touch-version">
|
|
||||||
<touch file="${lwjgl.src.native}/windows/org_lwjgl_opengl_Display.c"/>
|
|
||||||
<touch file="${lwjgl.src.native}/linux/org_lwjgl_opengl_Display.c"/>
|
|
||||||
<touch file="${lwjgl.src.native}/macosx/org_lwjgl_opengl_Display.m"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="version-mismatch">
|
<target name="version-mismatch">
|
||||||
<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/WindowsSysImplementation.java" property="lwjgl.java.windows.version">
|
<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/WindowsSysImplementation.java" property="lwjgl.java.windows.version">
|
||||||
<filterchain>
|
<filterchain>
|
||||||
|
@ -459,18 +453,18 @@
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
<!-- Compiles the Java source code -->
|
<!-- Compiles the Java source code -->
|
||||||
<target name="compile" description="Compiles the java source code" depends="-initialize">
|
<target name="compile+NoGen" description="Compiles the java source code" depends="-initialize">
|
||||||
<javac debug="yes" destdir="${lwjgl.target.gen.classes}" nativeHeaderDir="${lwjgl.target.gen.headers}" source="1.8" target="1.8" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar:${lwjgl.lib}/asm-debug-all.jar" taskname="core">
|
<javac debug="yes" destdir="${lwjgl.target.gen.classes}" nativeHeaderDir="${lwjgl.target.gen.headers}" source="1.8" target="1.8" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar:${lwjgl.lib}/asm-debug-all.jar" taskname="core">
|
||||||
<!--<compilerarg value="-Xlint:unchecked"/>-->
|
<!--<compilerarg value="-Xlint:unchecked"/>-->
|
||||||
<src path="${lwjgl.src.java}"/>
|
<src path="${lwjgl.src.java}"/>
|
||||||
<src path="${lwjgl.target.gen.java}"/>
|
<src path="${lwjgl.target.gen.java}"/>
|
||||||
<exclude name="org/lwjgl/util/generator/**"/>
|
<exclude name="org/lwjgl/util/generator/**"/>
|
||||||
</javac>
|
</javac>
|
||||||
<!--<javac debug="yes" srcdir="${lwjgl.src.java}" destdir="${lwjgl.target.gen.classes}" includes="org/lwjgl/test/**" source="1.8" target="1.8" taskname="test" />-->
|
|
||||||
<!--<javac debug="yes" srcdir="${lwjgl.src.java}" destdir="${lwjgl.target.gen.classes}" includes="org/lwjgl/examples/**" source="1.8" target="1.8" taskname="examples" />-->
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile_native" depends="-initialize, generate-all, touch-version, version-mismatch" description="Compiles the native files">
|
<target name="compile" description="Compiles the java source code" depends="generate-all, compile+NoGen"/>
|
||||||
|
|
||||||
|
<target name="compile_native+NoGen" depends="-initialize" description="Compiles the native files">
|
||||||
<condition property="lwjgl.platform.windows">
|
<condition property="lwjgl.platform.windows">
|
||||||
<os family="windows" />
|
<os family="windows" />
|
||||||
</condition>
|
</condition>
|
||||||
|
@ -502,6 +496,8 @@
|
||||||
<antcall target="-compile_native_macosx" />
|
<antcall target="-compile_native_macosx" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
<target name="compile_native" description="Compiles the java source code" depends="generate-all, version-mismatch, compile_native+NoGen"/>
|
||||||
|
|
||||||
<!-- Compiles LWJGL on Win32 platforms -->
|
<!-- Compiles LWJGL on Win32 platforms -->
|
||||||
<target name="-compile_native_win32" if="lwjgl.platform.windows">
|
<target name="-compile_native_win32" if="lwjgl.platform.windows">
|
||||||
<ant antfile="platform_build/windows_ant/build.xml"/>
|
<ant antfile="platform_build/windows_ant/build.xml"/>
|
||||||
|
@ -538,7 +534,7 @@
|
||||||
<version-check platform="macosx"/>
|
<version-check platform="macosx"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile_native_es" depends="-initialize, generate-all, touch-version, version-mismatch" description="Compiles the native files">
|
<target name="compile_native_es" depends="-initialize, generate-all, version-mismatch" description="Compiles the native files">
|
||||||
<condition property="lwjgl.platform.windows">
|
<condition property="lwjgl.platform.windows">
|
||||||
<os family="windows"/>
|
<os family="windows"/>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
Loading…
Reference in New Issue