Merge remote-tracking branch 'origin/master'

[mikumikustudio/libgdx-mikumikustudio.git] / extensions / gdx-controllers / gdx-controllers-desktop / src / com / badlogic / gdx / controllers / desktop / DesktopControllersBuild.java

diff --git a/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/desktop/DesktopControllersBuild.java
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/DesktopControllersBuild.java
rename to extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/desktop/DesktopControllersBuild.java
index 3cd86ae..1233336
--- a/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/desktop/DesktopControllersBuild.java
@@ -1,77 +1,77 @@
-\r
-package com.badlogic.gdx.controllers;\r
-\r
-import com.badlogic.gdx.jnigen.AntScriptGenerator;\r
-import com.badlogic.gdx.jnigen.BuildConfig;\r
-import com.badlogic.gdx.jnigen.BuildExecutor;\r
-import com.badlogic.gdx.jnigen.BuildTarget;\r
-import com.badlogic.gdx.jnigen.NativeCodeGenerator;\r
-import com.badlogic.gdx.jnigen.BuildTarget.TargetOs;\r
-\r
-public class DesktopControllersBuild {\r
-       public static void main (String[] args) throws Exception {\r
-               new NativeCodeGenerator().generate("src/", "bin/", "jni/");\r
-               BuildConfig buildConfig = new BuildConfig("gdx-controllers-desktop");\r
-               \r
-               String[] windowsSrc = {"*.cpp",\r
-                       "ois-v1-4svn/src/*.cpp",\r
-                       "ois-v1-4svn/src/win32/*.cpp"\r
-               };\r
-               \r
-               String[] linuxSrc = { "*.cpp",\r
-                       "ois-v1-4svn/src/*.cpp",\r
-                       "ois-v1-4svn/src/linux/*.cpp"\r
-               };\r
-               \r
-               String[] macSrc = { "*.cpp",\r
-                       "ois-v1-4svn/src/*.cpp",\r
-                       "ois-v1-4svn/src/linux/*.cpp"\r
-               };\r
-               \r
-               String[] includes = new String[] {\r
-                       "ois-v1-4svn/includes",\r
-                       "dinput/"\r
-               };\r
-               \r
-               BuildTarget win32home = BuildTarget.newDefaultTarget(TargetOs.Windows, false);\r
-               win32home.buildFileName = "build-windows32home.xml";\r
-               win32home.excludeFromMasterBuildFile = true;\r
-               win32home.is64Bit = false;\r
-               win32home.compilerPrefix = "";\r
-               win32home.cppIncludes = windowsSrc;\r
-               win32home.headerDirs = includes;\r
-               win32home.cIncludes = new String[0];\r
-               win32home.libraries = "-ldinput8 -ldxguid";\r
-               \r
-               BuildTarget win32 = BuildTarget.newDefaultTarget(TargetOs.Windows, false);\r
-               win32.cppIncludes = windowsSrc;\r
-               win32.headerDirs = includes;\r
-               win32.libraries = "-ldinput8 -ldxguid";\r
-               \r
-               BuildTarget win64 = BuildTarget.newDefaultTarget(TargetOs.Windows, true);\r
-               win64.cppIncludes = windowsSrc;\r
-               win64.headerDirs = includes;\r
-               win64.libraries = "-ldinput8 -ldxguid";\r
-               \r
-               BuildTarget lin32 = BuildTarget.newDefaultTarget(TargetOs.Linux, false);\r
-               lin32.cppIncludes = linuxSrc;\r
-               lin32.headerDirs = includes;\r
-               lin32.libraries = "-lX11";\r
-\r
-               BuildTarget lin64 = BuildTarget.newDefaultTarget(TargetOs.Linux, true);\r
-               lin64.cppIncludes = linuxSrc;\r
-               lin64.headerDirs = includes;\r
-               lin64.libraries = "-lX11";\r
-               \r
-               BuildTarget mac = BuildTarget.newDefaultTarget(TargetOs.MacOsX, false);\r
-               mac.cppIncludes = macSrc;\r
-               mac.headerDirs = includes;\r
-               mac.libraries = ""; // FIXME\r
-               \r
-               new AntScriptGenerator().generate(buildConfig, win32home, win32, win64, lin32, lin64, mac);\r
-               if(!BuildExecutor.executeAnt("jni/build-linux32.xml", "-Dhas-compiler=true -v postcompile")) {\r
-                       throw new Exception("build failed");\r
-               }\r
-               BuildExecutor.executeAnt("jni/build.xml", "pack-natives");\r
-       }\r
-}\r
+
+package com.badlogic.gdx.controllers;
+
+import com.badlogic.gdx.jnigen.AntScriptGenerator;
+import com.badlogic.gdx.jnigen.BuildConfig;
+import com.badlogic.gdx.jnigen.BuildExecutor;
+import com.badlogic.gdx.jnigen.BuildTarget;
+import com.badlogic.gdx.jnigen.NativeCodeGenerator;
+import com.badlogic.gdx.jnigen.BuildTarget.TargetOs;
+
+public class DesktopControllersBuild {
+       public static void main (String[] args) throws Exception {
+               new NativeCodeGenerator().generate("src/", "bin/", "jni/");
+               BuildConfig buildConfig = new BuildConfig("gdx-controllers-desktop");
+               
+               String[] windowsSrc = {"*.cpp",
+                       "ois-v1-4svn/src/*.cpp",
+                       "ois-v1-4svn/src/win32/*.cpp"
+               };
+               
+               String[] linuxSrc = { "*.cpp",
+                       "ois-v1-4svn/src/*.cpp",
+                       "ois-v1-4svn/src/linux/*.cpp"
+               };
+               
+               String[] macSrc = { "*.cpp",
+                       "ois-v1-4svn/src/*.cpp",
+                       "ois-v1-4svn/src/linux/*.cpp"
+               };
+               
+               String[] includes = new String[] {
+                       "ois-v1-4svn/includes",
+                       "dinput/"
+               };
+               
+               BuildTarget win32home = BuildTarget.newDefaultTarget(TargetOs.Windows, false);
+               win32home.buildFileName = "build-windows32home.xml";
+               win32home.excludeFromMasterBuildFile = true;
+               win32home.is64Bit = false;
+               win32home.compilerPrefix = "";
+               win32home.cppIncludes = windowsSrc;
+               win32home.headerDirs = includes;
+               win32home.cIncludes = new String[0];
+               win32home.libraries = "-ldinput8 -ldxguid";
+               
+               BuildTarget win32 = BuildTarget.newDefaultTarget(TargetOs.Windows, false);
+               win32.cppIncludes = windowsSrc;
+               win32.headerDirs = includes;
+               win32.libraries = "-ldinput8 -ldxguid";
+               
+               BuildTarget win64 = BuildTarget.newDefaultTarget(TargetOs.Windows, true);
+               win64.cppIncludes = windowsSrc;
+               win64.headerDirs = includes;
+               win64.libraries = "-ldinput8 -ldxguid";
+               
+               BuildTarget lin32 = BuildTarget.newDefaultTarget(TargetOs.Linux, false);
+               lin32.cppIncludes = linuxSrc;
+               lin32.headerDirs = includes;
+               lin32.libraries = "-lX11";
+
+               BuildTarget lin64 = BuildTarget.newDefaultTarget(TargetOs.Linux, true);
+               lin64.cppIncludes = linuxSrc;
+               lin64.headerDirs = includes;
+               lin64.libraries = "-lX11";
+               
+               BuildTarget mac = BuildTarget.newDefaultTarget(TargetOs.MacOsX, false);
+               mac.cppIncludes = macSrc;
+               mac.headerDirs = includes;
+               mac.libraries = ""; // FIXME
+               
+               new AntScriptGenerator().generate(buildConfig, win32home, win32, win64, lin32, lin64, mac);
+               if(!BuildExecutor.executeAnt("jni/build-linux32.xml", "-Dhas-compiler=true -v postcompile")) {
+                       throw new Exception("build failed");
+               }
+               BuildExecutor.executeAnt("jni/build.xml", "pack-natives");
+       }
+}