From eb94669abf0e2bf778204bab8f0ad4730d0adbfa Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 1 Jan 2014 15:13:30 -0600
Subject: [PATCH] Link the gamepad library to Xinput9_1_0.dll so the DirectX
 Runtime Installer isn't required for Vista and later

---
 jni/gamepad_jni/buildwin.sh            |   5 ++---
 jni/gamepad_jni/win32/libxinput9_1_0.a | Bin 0 -> 5322 bytes
 jni/gamepad_jni/win64/libxinput9_1_0.a | Bin 0 -> 5242 bytes
 3 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 jni/gamepad_jni/win32/libxinput9_1_0.a
 create mode 100644 jni/gamepad_jni/win64/libxinput9_1_0.a

diff --git a/jni/gamepad_jni/buildwin.sh b/jni/gamepad_jni/buildwin.sh
index 1e5b9e6..9ac9177 100644
--- a/jni/gamepad_jni/buildwin.sh
+++ b/jni/gamepad_jni/buildwin.sh
@@ -1,4 +1,3 @@
 rm gamepad_jni.dll gamepad_jni64.dll
-/C/MinGW/bin/gcc -shared -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include" -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include/win32" *.c -L./win32 -lstem_gamepad -lxinput1_3 -Wl,--no-undefined -Wl,--kill-at -o gamepad_jni.dll
-/C/MinGW-w64/bin/gcc -shared -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include" -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include/win32" *.c -L./win64 -lstem_gamepad -lxinput1_3 -Wl,--no-undefined -Wl,--kill-at -o gamepad_jni64.dll
-
+/C/MinGW/bin/gcc -m32 -shared -Wall -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include" -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include/win32" *.c -L./win32 -lstem_gamepad -lxinput9_1_0 -Wl,--no-undefined -Wl,--kill-at -o gamepad_jni.dll
+/C/MinGW-w64/bin/gcc -m64 -shared -Wall -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include" -I"/C/Program Files (x86)/Java/jdk1.7.0_45/include/win32" *.c -L./win64 -lstem_gamepad -lxinput9_1_0 -Wl,--no-undefined -Wl,--kill-at -o gamepad_jni64.dll
diff --git a/jni/gamepad_jni/win32/libxinput9_1_0.a b/jni/gamepad_jni/win32/libxinput9_1_0.a
new file mode 100644
index 0000000000000000000000000000000000000000..d4bc6933a421bf99036709339172af3e8793ab9a
GIT binary patch
literal 5322
zcmeI0&2G~`5XZ+(N=sDnQ6bbrK?Z@u0R`ui6jfCa6%|ssP*nAV<J1mu>!wxXR6TI0
zICJPj@E|+^k3^Z-4|^Tkae8R03Rd!ZGyC^$JoEGH+D}&Oqn-Y0>6H;Lm0GLSG+R}(
zZWt!(QftGgHLBu*P6+_!0koe0#TNjxOZ>R~8-R}aQ-0j-0noAVk`BxAz3z!OI2;Ab
zR>d+c+wunXz6+MscWo!p3)c1r5^uV}W?%<yyM;<`|IkXYbLD!5QniQ5watUkz<E1z
zyn{9O*xPZ}N1iimSE}(@@Y)H=aI|;!q22X-FYw&dF%tc2zW>qo2FiSj1sreR56TB&
zh_Yf+G0kSPX&8-GEsV{Eb_>G;u%w~)S!+fs2kuG0+S!!>W~c1fft@X3J#8?5mAk`X
zjtovo=h1-A>QY<8MiKv)TG)78*N}G7&1LIeOWi$e%%|vNzk*xY@qH-wJl_?af6f8E
zYCU^T8iZZ-6%Ab&8=qvVpY$w^;-f;AM)42bb3vmzUW5;sZ)UJ-f`<8pqF>O+Gsz-H
zCyfq|u+DrcOT=LR0t_~n8wmzi(RT~%ZxpYa!K(De18fk3hKMW0CX2zvvDhoR7}NBu
zsfBdX*U~=z`wn)@QW}N(ti@Pnt!XIjv($-qf>*GJLoeu$27BDXIDu;*nR%K1Q$Zs?
zlW(JP0g{<_ImzRG<Ksyyo#_e0e8*~D=|GQ5=E9O#Ys5;#m>-&0>Ky#MyxXktHPSFT
zr44PCP5up8paqgBQzJl@IXqrs|7XDqos7%NyJ4OrFV%6fFUq_CCa4iX38Sfnntr-2
z#{3Fuj?#5a8jA`&`)#3N238qx{+t?TXOWHOj<5IBN0FufP9)&o0uSzE`mMH9Kht!D
zWQGQH&0_gj-aYdY&4O1c>yUVclnl+EGofMkNdJK|PS;bR**T97*>3<Ehg-_RLMI*G
zW1X^<$=c#%Y?3HTGh%E1i6y^s*g~=|mDqwHR_-rp{(pp6dCTLQ@|Zn+TOSfzos!sA
z^xh$J><<icUXFD*3XF)W%&`My-bp$3Bwd#v_ItW6%&||Ax@mK)9ub@VR&&D%#+Ol6
zqMZ9lSm>m~F4iLFPJXddvv7_whw{pllsA$)iBpVx9_8B#9al+tSDAMb<$k&@LHTjI
zE~I=BBR4JOT12_}-hHEU^J4-SOGNf6H?UfVEj&kLtGBIuVwmu`B8OsgN{TB<iUW*n
z9>p6<^skcQEoI(G6nD~f35s{qbs@#%hiNGW5MPAwnwz|<kY6Gqa%shqMTa-ow3Lru
L;v-+ol1}GeC-1ng

literal 0
HcmV?d00001

diff --git a/jni/gamepad_jni/win64/libxinput9_1_0.a b/jni/gamepad_jni/win64/libxinput9_1_0.a
new file mode 100644
index 0000000000000000000000000000000000000000..36923c5dd1040204d8cfc0334d0433de2c7ac5e1
GIT binary patch
literal 5242
zcmeI0-)qxQ6vt1KZn`q@*B*wVM46x<HC?;df#}4+R2U5AgAZbwEvb#my0WHoh>Sf9
z5uf(pAGANgKf=GmdCtAL$xV~Hwl9^T7n0nZ`)%&c_kMD6(>qU`-Obk1(jy~XD%E=3
zs+iU4qG6b<N!}YqwNi_I&?o`GG(h11posO!pM0A-0-$ZW&bQ0A0cgAWi#FR1{EdCT
z-RXskcEvVr$M)OKwg-00bKFcLynRK|buU~Goe)*FzumF>g8XzPPZI}Y&GPzAukAkX
zx&F?wx94wqD?Q)srY?*>QmEpqyl^_sh9CH$?`3|QYFiG1RmX2f*B58*r~M!-@5JV-
zT(6j>Wm$%?uvm#*cfU@e@c?rL^p({npd5PpA*-u*2COy8t`j<H32Rw`wUhEjw>v-v
zhotlAf^#*Yy@-_}j!P~}U<%!Wh?8zwt$QqVSFkdZqZ94o$mfLtRd#~_%1uA;qQ>8+
z03QlXXG;X4xa=8qq4)JeGTARprIEbSRT{~sBGZrq=@NO#Jet5Jy`a=Ee~1FTKn`UK
z^+AO+8r;IY^0_M!i>(n@v=(?qFpNe?uxO!od?dxc&Eh=WH<cOOh{f4xUTJRfSR`$K
zk#sTJ{TezaU0$4Gm>NN6dwNQB=FcTo8-~snONuDR!e$zpVXN2P;t|G2%4xdEF%Zn$
z<ph(z<Y`jmY{18yVVa2rophw93g9N&^PL7{x#D%8#F!}VnpkQa<v|(Ms>&Jl0_*w+
zO{A9^a+C6wBJ?ai#P)X)O>{8895SO~29&Y{T`#X3CYdtMfaFmPJ8Me)LZVA$)H-T9
z`MQ{5x{oE)e9qTdVqDj-@-oth7~b*8={-6-K2Bmut=Rvz#wMCy>XXm;6xKL1oDV#W
z=+0#0Z0-fwLzZbF;)}UOJ?J8mWKj`e4y34L_ewL*N5n^n>luu2Dz9UW3O#K+a-W^^
zod(aa!rwe+uTK;#v&_qwt^Q}0Jmt8>tA(*Jt4A{!FBEYc{|2-19m{L#B$&S(Pnew_
zlG%DT&;G!P9+YQ;DEH7|oOyOn>i4WXdzi1wF#A1U7w6f#cz>hjSuJ5!@ttzM8J<H=
zs3dv!H4m`81`ZzMFEND!eNd}ZgD9^INqG%Fmsz1TF<(u5!<ipMc|)ROoRoi*`aO&C
zFkhFU{2*T!Q$C9`HY(+XWR6o`)aN-n--tL)$c`<-77bQqvQu~6$8)-E5XI(@6r0&x
z{RL-s5XEn#*&ipx@1=gvqPUf>%TT<VuZyRMd>EBt0P&yCdCAGic;&UQSRE(i(ieg#
P8a%)%XH@)Nwd(x?2Bx_3

literal 0
HcmV?d00001