OSDN Git Service

Seems like jenkins is having trouble finding including the files
authorXoppa <contact@xoppa.nl>
Mon, 17 Jun 2013 19:36:10 +0000 (21:36 +0200)
committerXoppa <contact@xoppa.nl>
Mon, 17 Jun 2013 19:36:10 +0000 (21:36 +0200)
extensions/gdx-bullet/jni/Android.mk
extensions/gdx-bullet/jni/build-ios32.xml
extensions/gdx-bullet/jni/build-linux32.xml
extensions/gdx-bullet/jni/build-linux64.xml
extensions/gdx-bullet/jni/build-macosx32.xml
extensions/gdx-bullet/jni/build-windows32.xml
extensions/gdx-bullet/jni/build-windows32home.xml
extensions/gdx-bullet/jni/build-windows64.xml
extensions/gdx-bullet/src/com/badlogic/gdx/physics/bullet/BulletBuild.java

index 4ab013b..b173ded 100644 (file)
@@ -2,13 +2,13 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)\r
  \r
 LOCAL_MODULE    := gdx-bullet\r
-LOCAL_C_INCLUDES := src/bullet/ src/custom/ src/extras/serialize \r
+LOCAL_C_INCLUDES := src/bullet/ src/custom/ src/extras/serialize/ \r
  \r
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O2 -Wall -D__ANDROID__\r
 LOCAL_CPPFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -O2 -Wall -D__ANDROID__ -fno-strict-aliasing -fno-rtti -DBT_NO_PROFILE\r
 LOCAL_LDLIBS := -lm\r
 LOCAL_ARM_MODE  := arm\r
-\r
\r
 LOCAL_SRC_FILES := memcpy_wrap.c\
        src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp\
        src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp\
index 1fbfe6c..138e947 100755 (executable)
@@ -84,7 +84,7 @@
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
index ea2cbe2..38ef4ba 100644 (file)
@@ -95,7 +95,7 @@
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
index 54aa732..0c2048d 100644 (file)
@@ -95,7 +95,7 @@
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
index 2c1e5f6..810d7eb 100644 (file)
@@ -95,7 +95,7 @@
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
index ebd6bbd..82897bb 100644 (file)
@@ -95,7 +95,7 @@
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
index a8c5eb1..6cd59d5 100644 (file)
@@ -95,7 +95,7 @@
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
index 4882c5c..d13826a 100644 (file)
@@ -95,7 +95,7 @@
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
                        <arg value="-I."/>\r
                                                <arg value="-Isrc/bullet/"/>
                        <arg value="-Isrc/custom/"/>
-                       <arg value="-Isrc/extras/serialize"/>
+                       <arg value="-Isrc/extras/serialize/"/>
 \r
                        <srcfile/>\r
                        <arg value="-o"/>\r
index 6c25f96..43189f8 100644 (file)
@@ -45,7 +45,7 @@ public class BulletBuild {
 \r
                // generate build scripts\r
                String[] excludes = {"src/bullet/BulletMultiThreaded/GpuSoftBodySolvers/**"};\r
-               String[] headers = {"src/bullet/", "src/custom/", "src/extras/serialize"};\r
+               String[] headers = {"src/bullet/", "src/custom/", "src/extras/serialize/"};\r
 \r
                BuildTarget win32home = BuildTarget.newDefaultTarget(TargetOs.Windows, false);\r
                win32home.compilerPrefix = "";\r