From a724093cf3409159cbdcfd0ad0c6c5e7ee1c8353 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Wed, 15 May 2013 11:10:16 +0000
Subject: [PATCH] Fixes for Android
---
contrib/mobile/Android/AndroidManifest.xml | 14 +++++++-------
.../Android/src/org/geuz/onelab/MainActivity.java | 5 +++--
contrib/mobile/CMakeLists.txt | 4 ++--
contrib/mobile/drawGModel.h | 4 +++-
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml
index 0af6f2aa88..1c288d7224 100644
--- a/contrib/mobile/Android/AndroidManifest.xml
+++ b/contrib/mobile/Android/AndroidManifest.xml
@@ -20,14 +20,14 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
- <intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msh" android:mimeType="*/*" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.geo" android:mimeType="*/*" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" />
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msh" android:mimeType="*/*" />
+ <data android:scheme="file" android:host="*" android:pathPattern=".*\\.geo" android:mimeType="*/*" />
+ <data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" />
</intent-filter>
</activity>
</application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
index 16cac2cb83..e05a47571c 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
@@ -25,6 +25,7 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.XmlResourceParser;
import android.graphics.Color;
@@ -94,7 +95,7 @@ public class MainActivity extends Activity {
dialogBuilder = new AlertDialog.Builder(this);
Intent intent = getIntent();
-
+
gmsh = new Gmsh("", mainHandler);
modelList = new Models();
getModels();
@@ -107,7 +108,7 @@ public class MainActivity extends Activity {
model = 0;
String tmp = getFilesDir()+ "/" + modelList.getFile(model);
gmsh.load(tmp);
- }
+ }
setContentView(layout);
}
diff --git a/contrib/mobile/CMakeLists.txt b/contrib/mobile/CMakeLists.txt
index c6f34b9d1e..54013e6fbd 100644
--- a/contrib/mobile/CMakeLists.txt
+++ b/contrib/mobile/CMakeLists.txt
@@ -4,12 +4,12 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
set(DEFAULT ON CACHE INTERNAL "Default value for enabled-by-default options")
-option(ENABLE_BUILD_ANDROID "Build library for Android NDK (ARMv7)" OFF)
if(APPLE)
option(ENABLE_BUILD_IOS "Build library for iOS (ARM)" OFF)
option(ENABLE_BUILD_IOS_EMULATOR "Build library for iOS emulator (x86)" ON)
+ option(ENABLE_BUILD_ANDROID "Build library for Android NDK (ARMv7)" OFF)
else(APPLE)
- set(ENABLE_BUILD_ANDROID ON)
+option(ENABLE_BUILD_ANDROID "Build library for Android NDK (ARMv7)" ON)
endif(APPLE)
macro(set_config_option VARNAME STRING)
diff --git a/contrib/mobile/drawGModel.h b/contrib/mobile/drawGModel.h
index 3849700d2b..ce71ef43c9 100644
--- a/contrib/mobile/drawGModel.h
+++ b/contrib/mobile/drawGModel.h
@@ -3,9 +3,11 @@
#include <string>
+#if defined(BUILD_IOS)
#include <Gmsh/PView.h>
#include <Gmsh/PViewOptions.h>
#include <Gmsh/Context.h>
+#endif
int onelab_cb(const std::string);
@@ -50,4 +52,4 @@ public:
bool isShowedGeom(){return _showGeom;}
};
-#endif
\ No newline at end of file
+#endif
--
GitLab