mirror of
https://github.com/shadowfacts/jinput-arm64.git
synced 2025-12-31 13:59:57 +01:00
Windows: More mingw fixes
This commit is contained in:
parent
0fb2152bde
commit
0a481c9adb
|
|
@ -3,7 +3,7 @@
|
|||
<project name="JInput dx8 port, Native code" basedir="." default="compile">
|
||||
<property environment="env"/>
|
||||
<property name="dxhome" location="${env.DXSDK_DIR}"/>
|
||||
<property name="sdkhome" location="${env.MSSDk}"/>
|
||||
<property name="plthome" location="${env.MSSdk}"/>
|
||||
<property name="chome" location="c:/MinGW"/>
|
||||
<property name="gcc" location="${chome}/bin/gcc"/>
|
||||
|
||||
|
|
@ -11,7 +11,6 @@
|
|||
<echo message="${compiledir}"/>
|
||||
<apply dir="${compiledir}" failonerror="true" executable="${gcc}" dest="${compiledir}" skipemptyfilesets="true">
|
||||
<arg line="-c -Wall -O2 -std=gnu99"/>
|
||||
<arg value="-I${sdkhome}/include"/>
|
||||
<arg value="-I${dxhome}/include"/>
|
||||
<arg value="-I${java.home}/../include"/>
|
||||
<arg value="-I${java.home}/../include/win32"/>
|
||||
|
|
@ -24,13 +23,12 @@
|
|||
</target>
|
||||
|
||||
<target name="link">
|
||||
<apply dir="." parallel="true" executable="cl" failonerror="true">
|
||||
<apply dir="." parallel="true" executable="${gcc}" failonerror="true">
|
||||
<arg value="-Wl,--kill-at"/>
|
||||
<arg line="-shared -o ${dllname}"/>
|
||||
<srcfile/>
|
||||
<arg value="-L${java.home}/lib"/>
|
||||
<arg value="-L${dxhome}/lib/x86"/>
|
||||
<arg value="-L${sdkhome}/lib"/>
|
||||
<arg line="${libs}"/>
|
||||
<fileset dir="${commonhome}/src/native" includes="*.o"/>
|
||||
<fileset dir="." includes="*.o"/>
|
||||
|
|
@ -48,8 +46,8 @@
|
|||
</target>
|
||||
|
||||
<target name="compile">
|
||||
<property name="rawlibs" value="Kernel32 User32 Setupapi"/>
|
||||
<property name="dx8libs" value="Kernel32 dinput8 dxguid User32"/>
|
||||
<property name="rawlibs" value="-lkernel32 -luser32 -lsetupapi"/>
|
||||
<property name="dx8libs" value="-lkernel32 -ldinput8 -ldxguid -luser32"/>
|
||||
<property name="commonhome" location="../../../common"/>
|
||||
<property name="dx8dllname" value="jinput-dx8.dll"/>
|
||||
<property name="rawdllname" value="jinput-raw.dll"/>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#include "rawwinver.h"
|
||||
#include <windows.h>
|
||||
#include <winuser.h>
|
||||
#include <jni.h>
|
||||
#include "net_java_games_input_RawDevice.h"
|
||||
#include "util.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue