teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

fix v7

Browse source
This commit is contained in:
root 2014-08-06 07:48:16 +04:00
parent 8978f9bcc6
commit 713787d92f
9 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

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

8
apps/openmw/CMakeLists.txt
View file

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

2
components/CMakeLists.txt
View file

@ -50,7 +50,7 @@ add_component_dir (misc
) )
add_component_dir (files add_component_dir (files
linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
constrainedfiledatastream lowlevelfile constrainedfiledatastream lowlevelfile
) )

5
components/files/androidpath.cpp
View file

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

2
components/files/androidpath.hpp
View file

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

20
components/files/fixedpath.hpp
View file

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

1
components/files/linuxpath.hpp
View file

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

2
components/ogreinit/ogreinit.cpp
View file

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

2
libs/openengine/gui/manager.cpp
View file

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