From e2d5fc8e24f5647d33ff80465432b4e0045a8a33 Mon Sep 17 00:00:00 2001
From: endolf <endolf@java.net>
Date: Sun, 29 Oct 2006 17:47:35 +0000
Subject: [PATCH] Updates to build system for wintab plugin

---
 build.xml                           | 30 ++++++++++++++++++++++++++++-
 plugins/wintab/src/native/build.xml |  5 ++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index aea5b69..1b75783 100644
--- a/build.xml
+++ b/build.xml
@@ -64,6 +64,7 @@
 				<fileset file="coreAPI/build.xml"/>
 				<fileset file="plugins/linux/build.xml"/>
 				<fileset file="plugins/windows/build.xml"/>
+				<fileset file="plugins/wintab/build.xml"/>
 				<fileset file="plugins/OSX/build.xml"/>
 				<fileset file="plugins/awt/build.xml"/>
 			</subant>
@@ -102,6 +103,9 @@
 			<fileset dir="plugins/windows/classes">
 				<include name="**/*.class"/>
 			</fileset>
+			<fileset dir="plugins/wintab/classes">
+				<include name="**/*.class"/>
+			</fileset>
 			<zipfileset src="lib/jutils.jar" includes="**/*.class"/>
 			<manifest>
 				<attribute name="Sealed" value="true"/>
@@ -112,10 +116,11 @@
 			<fileset dir="plugins/linux/bin" includes="*so"/>
 			<fileset dir="plugins/OSX/bin" includes="*jnilib"/>
 			<fileset dir="plugins/windows/bin" includes="*dll"/>
+			<fileset dir="plugins/wintab/bin" includes="*dll"/>
 		</copy>
     </target>
 	
-	<target name="simple_dist" depends="dist,simple_windows,simple_linux,simple_osx" description="Build the simple jars for each platform"/>
+	<target name="simple_dist" depends="dist,simple_windows,simple_wintab,simple_linux,simple_osx" description="Build the simple jars for each platform"/>
 	
 	<target name="simple_linux" depends="dist" description="Build the simple linux jar" if="linux">
 		<jar jarfile="dist/jinput-linux.jar" compress="true">
@@ -163,6 +168,29 @@
 		</zip>
 	</target>
 
+	<target name="simple_wintab" depends="dist" description="Build the simple windows jar" if="windows">
+		<jar jarfile="dist/jinput-wintab.jar" compress="true">
+			<fileset dir="coreAPI/classes">
+				<include name="**/*.class"/>
+			</fileset>
+			<fileset dir="plugins/wintab/classes">
+				<include name="**/*.class"/>
+			</fileset>
+			<zipfileset src="lib/jutils.jar" includes="**/*.class"/>
+			<manifest>
+				<attribute name="Sealed" value="true"/>
+			</manifest>
+		</jar>
+		<zip destfile="dist/jinput_wintab.zip">
+			<zipfileset dir=".">
+				<include name="dist/jinput-wintab.jar"/>
+			</zipfileset>
+			<zipfileset dir="plugins/wintab/bin">
+				<include name="*.dll"/>
+			</zipfileset>
+		</zip>
+	</target>
+
 	<target name="simple_osx" depends="dist" description="Build the simple osx jar" if="osx">
 		<jar jarfile="dist/jinput-osx.jar" compress="true">
 			<fileset dir="coreAPI/classes">
diff --git a/plugins/wintab/src/native/build.xml b/plugins/wintab/src/native/build.xml
index 152ef24..38691d9 100644
--- a/plugins/wintab/src/native/build.xml
+++ b/plugins/wintab/src/native/build.xml
@@ -42,10 +42,13 @@
 		<delete>
 			<fileset dir="." includes="*.obj"/>
 			<fileset dir="." includes="*.dll"/>
+			<fileset dir="." includes="*.h"/>
+			<fileset dir="." includes="*.exp"/>
+			<fileset dir="." includes="*.lib"/>
 		</delete>
 	</target>
 
-	<target name="compile">
+	<target name="compile" if="wintabhome">
 		<property name="wintablibs" value="Kernel32.lib WINTAB32.LIB User32.lib"/>
 		<property name="commonhome" location="../../../common"/>
 		<property name="dllname" value="jinput-wintab.dll"/>