Skip to content

Commit 786c223

Browse files
committed
Make x64 version of the projects, remove prebuilt binaries in favor of zipped releases, add build .bat files. Fixes #6.
1 parent d9f8c7f commit 786c223

26 files changed

+384
-59
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*.xcuserdata
2525
*.xcuserdatad
2626
*.orig
27+
*.meta
2728
obj/
2829
Binaries/
2930
XInputUnity/Library/

Binaries/XInputDemo.exe

-6.5 KB
Binary file not shown.

Binaries/XInputInterface.dll

-48.5 KB
Binary file not shown.

Binaries/XInputReporter.exe

-434 KB
Binary file not shown.

Build/BuildCurrentBranch.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@echo off
2+
setlocal
3+
4+
set _msbuildpath=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
5+
6+
"%_msbuildpath%" ..\XInputDotNetPure.sln /t:Clean /p:Configuration=Release /p:Platform=x86
7+
"%_msbuildpath%" ..\XInputDotNetPure.sln /t:Clean /p:Configuration=Release /p:Platform=x64
8+
9+
"%_msbuildpath%" ..\XInputDotNetPure.sln /t:Build /p:Configuration=Release /p:Platform=x86
10+
"%_msbuildpath%" ..\XInputInterface\XInputInterface.vcxproj /t:Build /p:Configuration=Release /p:Platform=Win32
11+
12+
"%_msbuildpath%" ..\XInputDotNetPure.sln /t:Build /p:Configuration=Release /p:Platform=x64

Build/Instructions.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
XInput.NET - https://github.com/speps/XInputDotNet
2+
3+
C# wrapper around XInput, works with any Mono or .NET application (eg. Unity3D)
4+
5+
Using XInputDotNet.dll
6+
======================
7+
8+
Visual Studio
9+
-------------
10+
11+
Right click on the project "References" folder, select "Add Reference". Click on "Browse" and select XInputDotNetPure.dll.
12+
13+
You will also have to copy the right XInputInterface*.dll depending on your target architecture.
14+
15+
Unity3D
16+
-------
17+
18+
Please use XInputDotNet.unityPackage provided on the website.
19+
20+
21+
About examples
22+
==============
23+
24+
XInputDemo.exe
25+
--------------
26+
27+
Demonstrates all the different API that is available.
28+
29+
XInputReporter.exe
30+
------------------
31+
32+
Visual debugging tool to see a controller representation with the current state values.

Build/PackageCurrentBranch.bat

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@echo off
2+
setlocal
3+
4+
call BuildCurrentBranch.bat
5+
6+
del ..\BinariesX86\Release\*.pdb
7+
del ..\BinariesX64\Release\*.pdb
8+
9+
copy Instructions.txt ..\BinariesX86\Release\Instructions.txt
10+
copy Instructions.txt ..\BinariesX64\Release\Instructions.txt
11+
copy ..\MITLicense.txt ..\BinariesX86\Release\MITLicense.txt
12+
copy ..\MITLicense.txt ..\BinariesX64\Release\MITLicense.txt
13+
14+
set /P _version=Enter version || set _version=NONE
15+
if "%_version%"=="NONE" goto :error
16+
17+
set _versionX86="XInputDotNet-x86-%_version%"
18+
set _versionX64="XInputDotNet-x64-%_version%"
19+
20+
move ..\BinariesX86\Release "%_versionX86%"
21+
move ..\BinariesX64\Release "%_versionX64%"
22+
23+
Zip\zip.exe -r "%_versionX86%.zip" "%_versionX86%"
24+
Zip\zip.exe -r "%_versionX64%.zip" "%_versionX64%"
25+
26+
del /S /Q "%_versionX86%"
27+
del /S /Q "%_versionX64%"
28+
rd /S /Q "%_versionX86%"
29+
rd /S /Q "%_versionX64%"
30+
31+
goto :eof
32+
33+
:error
34+
echo Version required
35+
goto :eof
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@echo off
2+
setlocal
3+
4+
call UpdateUnityProject.bat
5+
6+
copy ..\MITLicense.txt ..\XInputUnity\Assets\XInputDotNet\
7+
8+
set /P _version=Enter version || set _version=NONE
9+
if "%_version%"=="NONE" goto :error
10+
11+
set _version=XInputDotNet-%_version%.unityPackage
12+
set _projectPath=%~dp0..\XInputUnity
13+
14+
"C:\Program Files (x86)\Unity\Editor\Unity.exe" -batchmode -projectPath "%_projectPath%" -exportPackage "Assets\Plugins" "Assets\XInputDotNet" "..\Build\%_version%" -quit
15+
16+
goto :eof
17+
18+
:error
19+
echo Version required
20+
goto :eof

Build/UpdateUnityProject.bat

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@echo off
2+
setlocal
3+
4+
call BuildCurrentBranch.bat
5+
6+
if not exist ..\XInputUnity\Assets\Plugins\x86 md ..\XInputUnity\Assets\Plugins\x86
7+
if not exist ..\XInputUnity\Assets\Plugins\x86_64 md ..\XInputUnity\Assets\Plugins\x86_64
8+
9+
copy ..\BinariesX86\Release\XInputInterface.dll ..\XInputUnity\Assets\Plugins\x86\
10+
copy ..\BinariesX86\Release\XInputDotNetPure.dll ..\XInputUnity\Assets\Plugins\x86\
11+
12+
copy ..\BinariesX64\Release\XInputInterface.dll ..\XInputUnity\Assets\Plugins\x86_64\
13+
copy ..\BinariesX64\Release\XInputDotNetPure.dll ..\XInputUnity\Assets\Plugins\x86_64\

Build/Zip/LICENSE

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
This is version 2007-Mar-4 of the Info-ZIP license.
2+
The definitive version of this document should be available at
3+
ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely and
4+
a copy at http://www.info-zip.org/pub/infozip/license.html.
5+
6+
7+
Copyright (c) 1990-2007 Info-ZIP. All rights reserved.
8+
9+
For the purposes of this copyright and license, "Info-ZIP" is defined as
10+
the following set of individuals:
11+
12+
Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
13+
Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
14+
Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
15+
David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
16+
Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
17+
Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
18+
Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
19+
Rich Wales, Mike White.
20+
21+
This software is provided "as is," without warranty of any kind, express
22+
or implied. In no event shall Info-ZIP or its contributors be held liable
23+
for any direct, indirect, incidental, special or consequential damages
24+
arising out of the use of or inability to use this software.
25+
26+
Permission is granted to anyone to use this software for any purpose,
27+
including commercial applications, and to alter it and redistribute it
28+
freely, subject to the above disclaimer and the following restrictions:
29+
30+
1. Redistributions of source code (in whole or in part) must retain
31+
the above copyright notice, definition, disclaimer, and this list
32+
of conditions.
33+
34+
2. Redistributions in binary form (compiled executables and libraries)
35+
must reproduce the above copyright notice, definition, disclaimer,
36+
and this list of conditions in documentation and/or other materials
37+
provided with the distribution. The sole exception to this condition
38+
is redistribution of a standard UnZipSFX binary (including SFXWiz) as
39+
part of a self-extracting archive; that is permitted without inclusion
40+
of this license, as long as the normal SFX banner has not been removed
41+
from the binary or disabled.
42+
43+
3. Altered versions--including, but not limited to, ports to new operating
44+
systems, existing ports with new graphical interfaces, versions with
45+
modified or added functionality, and dynamic, shared, or static library
46+
versions not from Info-ZIP--must be plainly marked as such and must not
47+
be misrepresented as being the original source or, if binaries,
48+
compiled from the original source. Such altered versions also must not
49+
be misrepresented as being Info-ZIP releases--including, but not
50+
limited to, labeling of the altered versions with the names "Info-ZIP"
51+
(or any variation thereof, including, but not limited to, different
52+
capitalizations), "Pocket UnZip," "WiZ" or "MacZip" without the
53+
explicit permission of Info-ZIP. Such altered versions are further
54+
prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP
55+
e-mail addresses or the Info-ZIP URL(s), such as to imply Info-ZIP
56+
will provide support for the altered versions.
57+
58+
4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
59+
"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
60+
own source and binary releases.

0 commit comments

Comments
 (0)