From 08bb355749a54cc3d716e9869dac4adc08d2ada9 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Wed, 22 Aug 2012 22:34:20 -0500 Subject: [PATCH] AndroidGCS OSG: Increase OSG debugging level and try and include osgdb_3ds without success from the git build. --- androidgcs/jni/Android.mk | 3 ++- androidgcs/jni/OsgMainApp.cpp | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/androidgcs/jni/Android.mk b/androidgcs/jni/Android.mk index 2fbd46e5f..1379684c9 100644 --- a/androidgcs/jni/Android.mk +++ b/androidgcs/jni/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := osgNativeLib ### Main Install dir -OSG_ANDROID_DIR := ../../osg_android/osg +OSG_ANDROID_DIR := ../../osg_android_git/osg-install LIBDIR := $(OSG_ANDROID_DIR)/obj/local/armeabi ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) @@ -28,6 +28,7 @@ LOCAL_LDFLAGS := -L $(LIBDIR) \ -losgdb_osgterrain \ -losgdb_osg \ -losgdb_ive \ +-losgdb_3ds \ -losgdb_deprecated_osgviewer \ -losgdb_deprecated_osgvolume \ -losgdb_deprecated_osgtext \ diff --git a/androidgcs/jni/OsgMainApp.cpp b/androidgcs/jni/OsgMainApp.cpp index a39c121bc..3c82b0139 100644 --- a/androidgcs/jni/OsgMainApp.cpp +++ b/androidgcs/jni/OsgMainApp.cpp @@ -112,8 +112,7 @@ void OsgMainApp::initOsgWindow(int x,int y,int width,int height){ _notifyHandler = new OsgAndroidNotifyHandler(); _notifyHandler->setTag("Osg Viewer"); osg::setNotifyHandler(_notifyHandler); - - osg::notify(osg::ALWAYS)<<"Testing"<setUpViewerAsEmbeddedInWindow(x, y, width, height);