From c7ca903ca88db0167cc18af977b0e82b6600980f Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Tue, 17 Mar 2009 21:50:09 +0000
Subject: [PATCH] using windows dir instead of win32/win64

---
 build.xml                            | 17 +++++++++--------
 platform_build/build-applet.xml      | 16 +++++++++++++---
 platform_build/build-definitions.xml |  8 +++++---
 platform_build/build-webstart.xml    |  4 ++--
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index 0dace148..c3ef4975 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 		<mkdir dir="${lwjgl.temp}/doc" 						taskname="initialiazing temp/doc folder" />
 		<mkdir dir="${lwjgl.temp}/res" 						taskname="initialiazing temp/res folder" />
 		<mkdir dir="${lwjgl.temp}/native" 				taskname="initialiazing temp/native folder" />
-		<mkdir dir="${lwjgl.temp}/native/win32" 	taskname="initialiazing temp/win32 folder" />
+		<mkdir dir="${lwjgl.temp}/native/windows" 	taskname="initialiazing temp/windows folder" />
 		<mkdir dir="${lwjgl.temp}/native/linux" 	taskname="initialiazing temp/linux folder" />
 		<mkdir dir="${lwjgl.temp}/native/macosx" 	taskname="initialiazing temp/macosx folder" />
 		<mkdir dir="${lwjgl.temp}/native/solaris" taskname="initialiazing temp/solaris folder" />
@@ -41,7 +41,7 @@
 	<!-- Creates a distribution of LWJGL -->
 	<target name="release" description="Creates a distribution of LWJGL using supplied native binaries">
 		<!-- Warn user -->
-		<echo message="Before running the release target, please manually compile all platforms and place required files in ${lwjgl.lib}/win32, ${lwjgl.lib}/linux and ${lwjgl.lib}/macosx${line.separator}Missing files will result in a successfull built, but with incomplete release zips"/>
+		<echo message="Before running the release target, please manually compile all platforms and place required files in ${lwjgl.lib}/windows, ${lwjgl.lib}/linux and ${lwjgl.lib}/macosx${line.separator}Missing files will result in a successfull built, but with incomplete release zips"/>
   	<input 
   		message="All data in the ${lwjgl.dist} folder will be deleted. Continue? "
     	validargs="yes,no"
@@ -132,9 +132,10 @@
 		</delete>	
 
 	    <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
-		<copy todir="${lwjgl.temp}/native/win32">
-			<fileset dir="${lwjgl.lib}/win32">
-				<patternset refid="lwjgl-win32.fileset" />
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
+		<copy todir="${lwjgl.temp}/native/windows">
+			<fileset dir="${lwjgl.lib}/windows">
+				<patternset refid="lwjgl-windows.fileset" />
 			</fileset>
 		</copy>
 		<copy todir="${lwjgl.temp}/native/linux">
@@ -269,7 +270,7 @@
 	<!-- 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"/>
+		<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/windows"/>
 	</target>
 
 	<!-- Compiles LWJGL on Linux platforms -->
@@ -341,7 +342,7 @@
 
 	<target name="runtest" depends="all">
 		<fail message="test.mainclass is not set. Use 'ant -Dtest.mainclass=&lt;main-class&gt; runtest'" unless="test.mainclass"/>
-		<condition property="native_path" value="libs/win32">
+		<condition property="native_path" value="libs/windows">
 			<os family="windows" />
 		</condition>
 
@@ -367,7 +368,7 @@
 		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
 			<fileset refid="lwjgl.javadoc.fileset" />
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
-			<bottom><![CDATA[<i>Copyright &#169; 2002-2008 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+			<bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>
 </project>
diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml
index 4b385808..dec6185d 100644
--- a/platform_build/build-applet.xml
+++ b/platform_build/build-applet.xml
@@ -30,8 +30,8 @@
 		
 		<!-- create each of the native jars -->
 		<jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar">
-			<fileset dir="${lwjgl.lib}/win32">
-				<patternset refid="lwjgl-win32.fileset"/>
+			<fileset dir="${lwjgl.lib}/windows">
+				<patternset refid="lwjgl-windows.fileset"/>
 			</fileset>
 		</jar>
 		<signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
@@ -61,7 +61,8 @@
   		<fileset dir="${lwjgl.res}" includes="applet*"/>
   	</jar>
 
-	  <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
+	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.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}/jinput.jar" todir="applet"/>
@@ -76,6 +77,11 @@
 			<param name="input" value="applet/lwjgl.jar"/>
 			<param name="output" value="applet/lwjgl.jar.lzma"/>
 		</antcall>
+		<antcall target="compress-resource">
+			<param name="input" value="applet/lwjgl-debug.jar"/>
+			<param name="output" value="applet/lwjgl-debug.jar.lzma"/>
+		</antcall>
+		
 		<antcall target="compress-resource">
 			<param name="input" value="applet/lwjgl_util.jar"/>
 			<param name="output" value="applet/lwjgl_util.jar.lzma"/>
@@ -96,6 +102,10 @@
 			<param name="dir" value="applet/"/>
 			<param name="jarfile" value="lwjgl"/>
 		</antcall>
+		<antcall target="compress-sign-class">
+			<param name="dir" value="applet/"/>
+			<param name="jarfile" value="lwjgl-debug"/>
+		</antcall>
 		<antcall target="compress-sign-class">
 			<param name="dir" value="applet/"/>
 			<param name="jarfile" value="lwjgl_util"/>
diff --git a/platform_build/build-definitions.xml b/platform_build/build-definitions.xml
index 8eea8e73..b1f38f5d 100644
--- a/platform_build/build-definitions.xml
+++ b/platform_build/build-definitions.xml
@@ -85,10 +85,12 @@
 		<include name="3rdparty/*" />
 	</patternset>
 
-	<!-- Files to include in win32 package -->
-	<patternset id="lwjgl-win32.fileset">
+	<!-- Files to include in windows package -->
+	<patternset id="lwjgl-windows.fileset">
 		<include name="lwjgl.dll" />
+		<include name="lwjgl64.dll" />
 		<include name="OpenAL32.dll" />
+		<include name="OpenAL64.dll" />
     	<include name="jinput-dx8.dll" />
     	<include name="jinput-raw.dll" />
 	</patternset>
@@ -149,7 +151,7 @@
 		<exclude name="applet/lwjglkeystore" />
 	</patternset>		
 	
-	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/win32/lwjgl.dll" >
+	<uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/windows/lwjgl.dll" >
 	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
 	    <srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
 	</uptodate>
diff --git a/platform_build/build-webstart.xml b/platform_build/build-webstart.xml
index 15167585..ad3bf052 100644
--- a/platform_build/build-webstart.xml
+++ b/platform_build/build-webstart.xml
@@ -41,7 +41,7 @@
 		</move>
 		
 		<!-- create native jars -->
-		<jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/native/win32"/>
+		<jar destfile="${lwjgl.temp}/jnlp/native_windows.jar" basedir="${lwjgl.temp}/jnlp/temp/native/windows"/>
 		<jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/native/linux"/>
 		<jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/native/macosx"/>
 		<jar destfile="${lwjgl.temp}/jnlp/native_solaris.jar" basedir="${lwjgl.temp}/jnlp/temp/native/solaris"/>
@@ -55,7 +55,7 @@
 		<signjar jar="${lwjgl.temp}/jnlp/native_solaris.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}"/>
-		<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" 	alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="${lwjgl.temp}/jnlp/native_windows.jar" 	alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		<signjar jar="${lwjgl.temp}/jnlp/jinput.jar" 		alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 	</target>
 </project>
\ No newline at end of file