merged stuff

diff --cc extensions/gdx-controllers/gdx-controllers-desktop/jni/ois-v1-4svn/Win32/ois.sln
index 9ec9da6,a70c085..faa2260
mode 100755,100644..100644
--- 1/extensions/gdx-controllers/gdx-controllers-desktop/jni/ois-v1-3/Win32/ois.sln
--- 2/extensions/gdx-controllers/gdx-controllers-desktop/jni/ois-v1-4svn/Win32/ois.sln
+++ b/extensions/gdx-controllers/gdx-controllers-desktop/jni/ois-v1-4svn/Win32/ois.sln
@@@ -1,45 -1,39 +1,53 @@@
 -EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Console", "CommandLine\CommandLine.vcproj", "{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"
 -      ProjectSection(ProjectDependencies) = postProject
 -              {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
 -      EndProjectSection
 -EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_FFTest", "DemoFFTest\DemoFFTest.vcproj", "{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"
 -      ProjectSection(ProjectDependencies) = postProject
 -              {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
 -      EndProjectSection
 -EndProject
 -Global
 -      GlobalSection(SolutionConfiguration) = preSolution
 -              Debug = Debug
 -              Release = Release
 -      EndGlobalSection
 -      GlobalSection(ProjectConfiguration) = postSolution
 -              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug.ActiveCfg = Debug|Win32
 -              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug.Build.0 = Debug|Win32
 -              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release.ActiveCfg = Release|Win32
 -              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release.Build.0 = Release|Win32
 -              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug.ActiveCfg = Debug|Win32
 -              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug.Build.0 = Debug|Win32
 -              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release.ActiveCfg = Release|Win32
 -              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release.Build.0 = Release|Win32
 -              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug.ActiveCfg = Debug|Win32
 -              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug.Build.0 = Debug|Win32
 -              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release.ActiveCfg = Release|Win32
 -              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release.Build.0 = Release|Win32
 -      EndGlobalSection
 -      GlobalSection(ExtensibilityGlobals) = postSolution
 -      EndGlobalSection
 -      GlobalSection(ExtensibilityAddIns) = postSolution
 -      EndGlobalSection
 -EndGlobal
+ Microsoft Visual Studio Solution File, Format Version 8.00
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OIS", "OIS.vcproj", "{9CC704CB-4956-4479-BDEC-57CBC03F700E}"
+       ProjectSection(ProjectDependencies) = postProject
+       EndProjectSection
++Microsoft Visual Studio Solution File, Format Version 8.00\r
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OIS", "OIS.vcproj", "{9CC704CB-4956-4479-BDEC-57CBC03F700E}"\r
++      ProjectSection(ProjectDependencies) = postProject\r
++      EndProjectSection\r
 +Microsoft Visual Studio Solution File, Format Version 11.00\r
 +# Visual C++ Express 2010\r
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OIS", "OIS.vcxproj", "{9CC704CB-4956-4479-BDEC-57CBC03F700E}"\r
 +EndProject\r
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Console", "CommandLine\CommandLine.vcxproj", "{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"\r
 +EndProject\r
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_FFTest", "DemoFFTest\DemoFFTest.vcxproj", "{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"\r
 +EndProject\r
 +Global\r
 +      GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
 +              Debug|Win32 = Debug|Win32\r
 +              OIS_DebugDll|Win32 = OIS_DebugDll|Win32\r
 +              OIS_ReleaseDll|Win32 = OIS_ReleaseDll|Win32\r
 +              Release|Win32 = Release|Win32\r
 +      EndGlobalSection\r
 +      GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.ActiveCfg = Debug|Win32\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Debug|Win32.Build.0 = Debug|Win32\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_DebugDll|Win32.ActiveCfg = OIS_DebugDll|Win32\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_DebugDll|Win32.Build.0 = OIS_DebugDll|Win32\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_ReleaseDll|Win32.ActiveCfg = OIS_ReleaseDll|Win32\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.OIS_ReleaseDll|Win32.Build.0 = OIS_ReleaseDll|Win32\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.ActiveCfg = Release|Win32\r
 +              {9CC704CB-4956-4479-BDEC-57CBC03F700E}.Release|Win32.Build.0 = Release|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.ActiveCfg = Debug|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Debug|Win32.Build.0 = Debug|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.OIS_DebugDll|Win32.ActiveCfg = Debug|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.OIS_DebugDll|Win32.Build.0 = Debug|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.OIS_ReleaseDll|Win32.ActiveCfg = Release|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.OIS_ReleaseDll|Win32.Build.0 = Release|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.ActiveCfg = Release|Win32\r
 +              {7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}.Release|Win32.Build.0 = Release|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.ActiveCfg = Debug|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Debug|Win32.Build.0 = Debug|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.OIS_DebugDll|Win32.ActiveCfg = Debug|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.OIS_DebugDll|Win32.Build.0 = Debug|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.OIS_ReleaseDll|Win32.ActiveCfg = Release|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.OIS_ReleaseDll|Win32.Build.0 = Release|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.ActiveCfg = Release|Win32\r
 +              {D1912D13-C99D-4959-ABDC-62BF71AD5A1A}.Release|Win32.Build.0 = Release|Win32\r
 +      EndGlobalSection\r
 +      GlobalSection(SolutionProperties) = preSolution\r
 +              HideSolutionNode = FALSE\r
 +      EndGlobalSection\r
 +EndGlobal\r

diff --cc extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/DesktopControllersBuild.java
index c8bff77,9332cde..653eb80
--- 1/extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/DesktopControllersBuild.java
--- 2/extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/DesktopControllersBuild.java
+++ b/extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/DesktopControllersBuild.java
@@@ -27,9 -27,10 +27,10 @@@ public class DesktopControllersBuild 
                        "dinput/"\r
                };\r
                win32home.cIncludes = new String[0];\r
-               \r
+               win32home.linkerFlags += " "; // FIXME - Needs to be "-shared -o [modules] -ldinput8 -ldxguid".\r
+ \r
                new AntScriptGenerator().generate(buildConfig, win32home);\r
 -              BuildExecutor.executeAnt("jni/build-windows32home.xml", "-Dhas-compiler clean postcompile -v");\r
 +              BuildExecutor.executeAnt("jni/build-windows32home.xml", "-Dhas-compiler=true clean postcompile -v");\r
                BuildExecutor.executeAnt("jni/build.xml", "pack-natives");\r
        }\r
  }\r