Add support for UPX compression of Windows/Linux libraries

LWJGL · Apr 28, 2015 · 63e3875 · 63e3875
1 parent 23b27af
commit 63e3875
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/config/linux/build.xml b/config/linux/build.xml
@@ -114,7 +114,7 @@ License terms: http://lwjgl.org/license.php
 		<local name="version.script"/>
 		<property name="version.script" location="config/linux/version.script"/>
 
-		<apply dir="${bin.native}" executable="gcc" failonerror="true" parallel="true" taskname="Linker">
+		<apply dir="${lib}" executable="gcc" failonerror="true" parallel="true" taskname="Linker">
 			<srcfile/>
 			<arg line="-shared ${compiler.arch} -fPIC -pthread -o ${LWJGL_LIBRARY} ${libs} -Xlinker --version-script -Xlinker ${version.script}"/>
 
@@ -123,10 +123,13 @@ License terms: http://lwjgl.org/license.php
 			<fileset refid="link-ovr" if:true="${build.ovr}"/>
 		</apply>
 
-		<apply dir="${bin.native}" executable="strip" failonerror="true" taskname="Symbol strip">
+		<apply dir="${lib}" executable="strip" failonerror="true" taskname="Symbol strip">
 			<fileset file="${LWJGL_LIBRARY}"/>
 		</apply>
 
-		<move file="${bin.native}/${LWJGL_LIBRARY}" todir="${lib}"/>
+		<apply executable="${org.lwjgl.upx}/upx" failonerror="true" taskname="UPX" if:set="org.lwjgl.upx">
+			<arg value="-9"/>
+			<filelist dir="${lib}" files="${LWJGL_LIBRARY}"/>
+		</apply>
 	</target>
 </project>
diff --git a/config/macosx/build.xml b/config/macosx/build.xml
@@ -110,7 +110,7 @@ License terms: http://lwjgl.org/license.php
 	</target>
 
 	<target name="-link" depends="-update-dependencies">
-		<apply dir="${bin.native}" executable="${compiler}" failonerror="true" parallel="true" taskname="Linker">
+		<apply dir="${lib}" executable="${compiler}" failonerror="true" parallel="true" taskname="Linker">
 			<srcfile/>
 			<arg line='-dynamiclib -Wl,-no_compact_unwind -mmacosx-version-min=${macosx-version-min} -o ${LWJGL_LIBRARY}'/>
 			<arg line="-framework AppKit"/>
@@ -124,7 +124,5 @@ License terms: http://lwjgl.org/license.php
 			<fileset refid="link-objects"/>
 			<fileset refid="link-libraries"/>
 		</apply>
-
-		<move file="${bin.native}/${LWJGL_LIBRARY}" todir="${lib}"/>
 	</target>
 </project>
diff --git a/config/windows/build.xml b/config/windows/build.xml
@@ -100,7 +100,7 @@ License terms: http://lwjgl.org/license.php
 	</target>
 
 	<target name="-link" depends="-update-dependencies">
-		<apply dir="${bin.native}" executable="cl" failonerror="true" parallel="true" taskname="Linker">
+		<apply dir="${lib}" executable="cl" failonerror="true" parallel="true" taskname="Linker">
 			<arg line='/LD /WX /nologo /Fe:"${LWJGL_LIBRARY}"'/>
 			<srcfile/>
 			<arg line='/link /OPT:REF,ICF /DLL ${libs}'/>
@@ -110,6 +110,9 @@ License terms: http://lwjgl.org/license.php
 			<fileset refid="link-ovr" if:true="${build.ovr}"/>
 		</apply>
 
-		<move file="${bin.native}/${LWJGL_LIBRARY}" todir="${lib}"/>
+		<apply executable="${org.lwjgl.upx}/upx" failonerror="true" taskname="UPX" if:set="org.lwjgl.upx">
+			<arg value="-9"/>
+			<filelist dir="${lib}" files="${LWJGL_LIBRARY}"/>
+		</apply>
 	</target>
 </project>