android_irrlicht_vuforia.diff

diff --git a/jni/Android.mk b/jni/Android.mk
index d8f7995..eec3115 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -6,6 +6,7 @@ LOCAL_MODULE := irrlicht_vuforia
 
 LS_CPP=$(subst $(1)/,,$(wildcard $(1)/*.cpp))
 LOCAL_SRC_FILES := $(call LS_CPP,$(LOCAL_PATH))
+LOCAL_CPPFLAGS := -I$(LOCAL_PATH)/../../irrlichtandroid/project/include -Wno-error=format-security
 
 LOCAL_LDLIBS := -llog
 LOCAL_SHARED_LIBRARIES := QCAR
@@ -15,4 +16,4 @@ include $(BUILD_SHARED_LIBRARY)
 
 IRRLICHT_COMPILE_CONFIG_DIR := $(LOCAL_PATH)/libs/irrlicht
 include $(LOCAL_PATH)/libs/QCAR/Android.mk
-$(call import-module,irrlicht)
+$(call import-module,irrlichtandroid/project/jni)
diff --git a/src/name/nailgun/irrlichtvuforia/MainActivity.java b/src/name/nailgun/irrlichtvuforia/MainActivity.java
index 6e186ec..dc6ab61 100644
--- a/src/name/nailgun/irrlichtvuforia/MainActivity.java
+++ b/src/name/nailgun/irrlichtvuforia/MainActivity.java
@@ -103,6 +103,7 @@ public class MainActivity extends Activity
     static
     {
         loadLibrary(NATIVE_LIB_QCAR);
+        loadLibrary("irrlicht");
         loadLibrary(NATIVE_LIB_SAMPLE);
     }
     

irrlichtandroid.diff

diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index 8128725..ebda191 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -29,7 +29,8 @@ ANDROID = importgl.cpp app-android.cpp android-activity.cpp android-receiver.cpp
 LOCAL_MODULE := irrlicht
 
 LOCAL_ARM_MODE   := arm 
-LOCAL_CFLAGS := -O3 -DANDROID_NDK -DDISABLE_IMPORTGL -I./../include/ -I./include/
+LOCAL_CFLAGS := -O3 -DANDROID_NDK -DDISABLE_IMPORTGL -I$(LOCAL_PATH)/../include/ -I./include/
+LOCAL_CPPFLAGS := -Wno-error=format-security
 
 LOCAL_SRC_FILES := \
      $(ANDROID) \
diff --git a/project/jni/COGLESDriver.cpp b/project/jni/COGLESDriver.cpp
index 0b6cc72..3c39228 100644
--- a/project/jni/COGLESDriver.cpp
+++ b/project/jni/COGLESDriver.cpp
@@ -8,10 +8,12 @@
 
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
+#if 0
 #ifndef GL_BGRA
 // we need to do this for the IMG_BGRA8888 extension
 int GL_BGRA=GL_RGBA;
 #endif
+#endif
 
 #include "COGLESTexture.h"
 #include "COGLESMaterialRenderer.h"