Merge pull request #868 from sandstranger/build-fixes

Build fixes

CMakeLists.txt

@@ -16,6 +16,11 @@ endif (APPLE)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 
+if (ANDROID)
+    set(CMAKE_FIND_ROOT_PATH ${OPENMW_DEPENDENCIES_DIR} "${CMAKE_FIND_ROOT_PATH}")
+    set (OSG_PLUGINS_DIR CACHE STRING "")
+endif()
+
 # Version
 message(STATUS "Configuring OpenMW...")
 
@@ -157,7 +162,6 @@ if (WIN32)
 endif()
 
 if (ANDROID)
-    set(CMAKE_FIND_ROOT_PATH ${OPENMW_DEPENDENCIES_DIR} "${CMAKE_FIND_ROOT_PATH}")
     set(OPENGL_ES TRUE CACHE BOOL "enable opengl es support for android" FORCE)
 endif (ANDROID)
 

cmake/FindMyGUI.cmake

@@ -71,7 +71,7 @@ ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
     IF(MYGUI_STATIC)
         # don't use pkgconfig on OS X, find freetype & append it's libs to resulting MYGUI_LIBRARIES
-        IF (NOT APPLE)
+        IF (NOT APPLE AND NOT ANDROID)
             PKG_SEARCH_MODULE(MYGUI MYGUIStatic MyGUIStatic)
             IF (MYGUI_INCLUDE_DIRS)
                 SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS})
@@ -84,15 +84,15 @@ ELSE (WIN32) #Unix
                 STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
                 STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
             ENDIF (MYGUI_INCLUDE_DIRS)
-        ELSE (NOT APPLE)
+        ELSE (NOT APPLE AND NOT ANDROID)
             SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${MYGUI_DEPENDENCIES_DIR})
-            FIND_PACKAGE(freetype)
+            FIND_PACKAGE(Freetype REQUIRED)
             FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
-            FIND_LIBRARY(MYGUI_LIBRARIES MyGUIEngineStatic PATHS /usr/lib /usr/local/lib)
+            FIND_LIBRARY(MYGUI_LIBRARIES MyGUIEngineStatic PATHS /usr/lib /usr/local/lib ${OPENMW_DEPENDENCIES_DIR})
             SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
             STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
             STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
-        ENDIF (NOT APPLE)
+        ENDIF (NOT APPLE AND NOT ANDROID)
     ELSE(MYGUI_STATIC)
         PKG_SEARCH_MODULE(MYGUI MYGUI MyGUI)
         IF (MYGUI_INCLUDE_DIRS)
@@ -109,6 +109,7 @@ ELSE (WIN32) #Unix
     ENDIF(MYGUI_STATIC)
 ENDIF (WIN32)
 
+
 #Do some preparation
 IF (NOT WIN32) # This does not work on Windows for paths with spaces in them
 	SEPARATE_ARGUMENTS(MYGUI_INCLUDE_DIRS)