fix v7

CMakeLists.txt

@@ -58,16 +58,6 @@ if (ANDROID)
     set(CMAKE_FIND_ROOT_PATH ${OPENMW_DEPENDENCIES_DIR} "${CMAKE_FIND_ROOT_PATH}")
 endif (ANDROID)
 
-if (NOT ANDROID)
-    ADD_DEFINITIONS(-DNOT_ANDROID)
-endif()
-
-
-if (ANDROID)
-    ADD_DEFINITIONS(-DANDROID)
-endif()
-
-
 # doxygen main page
 
 configure_file ("${OpenMW_SOURCE_DIR}/docs/mainpage.hpp.cmake" "${OpenMW_SOURCE_DIR}/docs/mainpage.hpp")

apps/openmw/CMakeLists.txt

@@ -1,5 +1,4 @@
 # local files
-
 if (NOT ANDROID)
 set(GAME
     main.cpp
@@ -12,13 +11,9 @@ set(GAME
     engine.cpp
 )
 endif()
-
-
 if(NOT WIN32 AND NOT ANDROID)
     set(GAME ${GAME} crashcatcher.cpp)
 endif()
-
-
 set(GAME_HEADER
     engine.hpp
 )
@@ -115,7 +110,8 @@ add_executable(openmw
     ${APPLE_BUNDLE_RESOURCES}
 )
 else ()
-add_library(openmw SHARED
+add_library(openmw 
+    SHARED
     ${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
     ${OPENMW_FILES}
     ${GAME} ${GAME_HEADER}

components/files/androidpath.cpp

@@ -83,6 +83,11 @@ boost::filesystem::path AndroidPath::getGlobalDataPath() const
     return globalDataPath / mName;
 }
 
+boost::filesystem::path AndroidPath::getInstallPath() const
+{
+    return boost::filesystem::path();
+}
+
 
 } /* namespace Files */
 

components/files/androidpath.hpp

@@ -42,6 +42,8 @@ struct AndroidPath
      */
     boost::filesystem::path getCachePath() const;
 
+    boost::filesystem::path getInstallPath() const;
+
     std::string mName;
 };
 

components/files/fixedpath.hpp

@@ -5,7 +5,7 @@
 #include <boost/filesystem.hpp>
 
 #if defined(__linux__) || defined(__FreeBSD__) 
-#ifdef NOT_ANDROID
+#ifndef ANDROID
     #include <components/files/linuxpath.hpp>
     namespace Files { typedef LinuxPath TargetPathType; }
 #else
@@ -50,7 +50,7 @@ struct FixedPath
      *
      * \param [in] application_name - Name of the application
      */
-#ifdef NOT_ADNROID
+
     FixedPath(const std::string& application_name)
         : mPath(application_name + "/")
         , mUserConfigPath(mPath.getUserConfigPath())
@@ -62,17 +62,7 @@ struct FixedPath
         , mCachePath(mPath.getCachePath())
     {
     }
-#else
-    FixedPath(const std::string& application_name)
-        : mPath(application_name + "/")
-        , mUserConfigPath(mPath.getUserConfigPath())
-        , mUserDataPath(mPath.getUserDataPath())
-        , mGlobalConfigPath(mPath.getGlobalConfigPath())
-        , mLocalPath(mPath.getLocalPath())
-        , mGlobalDataPath(mPath.getGlobalDataPath())
-        , mCachePath(mPath.getCachePath())
-    {
-    }
+
 #endif
     /**
      * \brief Return path pointing to the user local configuration directory.
@@ -103,12 +93,12 @@ struct FixedPath
         return mLocalPath;
     }
 
-#ifdef NOT_ANDROID
+
     const boost::filesystem::path& getInstallPath() const
     {
         return mInstallPath;
     }
-#endif
+
     const boost::filesystem::path& getGlobalDataPath() const
     {
         return mGlobalDataPath;

components/files/linuxpath.hpp

@@ -4,6 +4,7 @@
 #if defined(__linux__) || defined(__FreeBSD__)
 
 #include <boost/filesystem.hpp>
+
 /**
  * \namespace Files
  */

components/ogreinit/ogreinit.cpp

@@ -95,7 +95,7 @@ namespace OgreInit
     Ogre::Root* OgreInit::init(const std::string &logPath)
     {
 
-        #ifdef NOT_ANDROID
+        #ifndef ANDROID
         // Set up logging first
         new Ogre::LogManager;
         Ogre::Log *log = Ogre::LogManager::getSingleton().createLog(logPath);

libs/openengine/gui/manager.cpp

@@ -653,7 +653,7 @@ void MyGUIManager::updateWindow (Ogre::RenderWindow *wnd)
 
 void MyGUIManager::windowResized()
 {
-#ifdef NOT_ANDROID
+#ifndef ANDROID
     mRenderManager->setActiveViewport(0);
 #endif
 }