From 40f2e7fd2586532897b0c1764bae58616632c236 Mon Sep 17 00:00:00 2001
From: Endolf <endolf@computerbooth.com>
Date: Fri, 18 May 2018 18:12:17 +0100
Subject: [PATCH] Steps towards wintab build

---
 plugins/wintab/pom.xml                   |   2 +-
 plugins/wintab/src/main/native/build.xml | 118 +++++++++++------------
 2 files changed, 55 insertions(+), 65 deletions(-)

diff --git a/plugins/wintab/pom.xml b/plugins/wintab/pom.xml
index 030fa71..4121eeb 100644
--- a/plugins/wintab/pom.xml
+++ b/plugins/wintab/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>net.java.jinput</groupId>
-            <artifactId>coreapi</artifactId>
+            <artifactId>windows-plugin</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/plugins/wintab/src/main/native/build.xml b/plugins/wintab/src/main/native/build.xml
index 38691d9..5bea661 100644
--- a/plugins/wintab/src/main/native/build.xml
+++ b/plugins/wintab/src/main/native/build.xml
@@ -1,73 +1,63 @@
 <?xml version="1.0"?>
 
 <project name="JInput wintab port, Native code" basedir="." default="compile">
-	<property environment="env"/>
-	<property name="wintabhome" location="${env.WINTAB_DIR}"/>
-	<property name="sdkhome" location="c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2"/>
+    <property environment="env"/>
+    <property name="wintabhome" location="${env.WINTAB_DIR}"/>
+    <property name="sdkhome" location="${env.WindowsSdkDir}"/>
 
-	<target name="compile_dir">
-		<echo message="${compiledir}"/>
-		<echo message="wintab: ${wintabhome}"/>
-		<apply dir="${compiledir}" failonerror="true" executable="cl" dest="${compiledir}" skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /c"/>
-			<arg value="/I${sdkhome}\include"/>
-			<arg value="/I${wintabhome}\include"/>
-			<arg value="/I${java.home}\..\include"/>
-			<arg value="/I${java.home}\..\include\win32"/>
-			<arg value="/I${commonhome}/src/native"/>
-			<arg value="/I.."/>
-			<srcfile/>
-			<fileset dir="${compiledir}" includes="*.c"/>
-			<mapper type="glob" from="*.c" to="*.obj"/>
-		</apply>
-	</target>
+    <target name="compile_dir">
+        <echo message="${compiledir}"/>
+        <echo message="wintab: ${wintabhome}"/>
+        <apply dir="${compiledir}" failonerror="true" executable="cl" dest="${compiledir}" skipemptyfilesets="true">
+            <arg line="/Ox /W2 /nologo /c"/>
+            <arg value="/I${sdkhome}\include"/>
+            <arg value="/I${wintabhome}\include"/>
+            <arg value="/I${java.home}\include"/>
+            <arg value="/I${java.home}\include\win32"/>
+            <arg value="/I${commonhome}/src/native"/>
+            <arg value="/I.."/>
+            <srcfile/>
+            <fileset dir="${compiledir}" includes="*.c"/>
+            <mapper type="glob" from="*.c" to="*.obj"/>
+        </apply>
+    </target>
 
-	<!--	<target name="link" unless="nolink">-->
-	<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:${wintabhome}\lib\I386"/>
-			<arg value="/LIBPATH:${sdkhome}\lib"/>
-			<arg line="/DLL ${libs}"/>
-			<fileset dir="${commonhome}/src/native" includes="*.obj"/>
-			<fileset dir="." includes="*.obj"/>
-			<fileset dir="../../../windows/src/native" includes="*.obj"/>
-		</apply>
-	</target>
+    <!--	<target name="link" unless="nolink">-->
+    <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:${wintabhome}\lib\I386"/>
+            <arg value="/LIBPATH:${sdkhome}\lib"/>
+            <arg line="/DLL ${libs}"/>
+            <fileset dir="${commonhome}/src/native" includes="*.obj"/>
+            <fileset dir="." includes="*.obj"/>
+            <fileset dir="../../../windows/src/native" includes="*.obj"/>
+        </apply>
+    </target>
 
-	<target name="clean">
-		<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" if="wintabhome">
-		<property name="wintablibs" value="Kernel32.lib WINTAB32.LIB User32.lib"/>
-		<property name="commonhome" location="../../../common"/>
-		<property name="dllname" value="jinput-wintab.dll"/>
-		<antcall target="compile_dir">
-			<param name="compiledir" location="${commonhome}/src/native"/>
-		</antcall>
-		<antcall target="compile_dir">
-			<param name="compiledir" location="."/>
-		</antcall>
-		<antcall target="compile_dir">
-			<param name="compiledir" location="../../../windows/src/native"/>
-		</antcall>
-		<!--		<uptodate property="nolink" targetfile="${dllname}">
-			<srcfiles dir="." includes="*.obj"/>
-		</uptodate>-->
-		<antcall target="link">
-			<param name="dllname" value="${dllname}"/>
-			<param name="libs" value="${wintablibs}"/>
-		</antcall>
+    <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"/>
+        <antcall target="compile_dir">
+            <param name="compiledir" location="${commonhome}/src/native"/>
+        </antcall>
+        <antcall target="compile_dir">
+            <param name="compiledir" location="."/>
+        </antcall>
+        <antcall target="compile_dir">
+            <param name="compiledir" location="../../../windows/src/native"/>
+        </antcall>
+        <!--		<uptodate property="nolink" targetfile="${dllname}">
+            <srcfiles dir="." includes="*.obj"/>
+        </uptodate>-->
+        <antcall target="link">
+            <param name="dllname" value="${dllname}"/>
+            <param name="libs" value="${wintablibs}"/>
+        </antcall>
     </target>
 </project>