[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49071] branches/soc-2012-swiss_cheese: Updating Cmake to support Android App.

[Alexander Kuznetsov]

Revision: 49071
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49071
Author:   alexk
Date:     2012-07-19 20:46:48 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Updating Cmake to support Android App.
App itself will follow.

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/CMakeLists.txt
    branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_android.cmake
    branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake

Modified: branches/soc-2012-swiss_cheese/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/CMakeLists.txt	2012-07-19 20:19:03 UTC (rev 49070)
+++ branches/soc-2012-swiss_cheese/CMakeLists.txt	2012-07-19 20:46:48 UTC (rev 49071)
@@ -503,7 +503,15 @@
 	# set lib directory if it exists
 	if(WITH_ANDROID)
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/android/${ANDROID_TARGET})
-		set(ANDROID_PROJ ${LIBDIR}/aghosty-sdl CACHE STRING  "boo")
+		
+		if(NOT WITH_GHOST_SDL)
+			set(ANDROID_APP_LIBPATH ${CMAKE_SOURCE_DIR}/source/android/app/libs/armeabi/)
+			set(ANDROID_APP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/source/android/app/jni/)
+			set(ANDROID_APP_LIBRARY main)
+			set(ANDROID_PROJ ${CMAKE_SOURCE_DIR}/source/android/app)
+		else()
+			set(ANDROID_PROJ ${LIBDIR}/aghosty-sdl CACHE STRING  "Android Project Path")
+		endif()
 	elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
 			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
@@ -535,14 +543,14 @@
 		set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
 
 		set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz.so.1)
-
+	if(WITH_GHOST_SDL)
 		set(SDL_INCLUDE_DIR ${LIBDIR}/aghosty-sdl/jni/SDL/include/)
 		
 		set(SDLMAIN_LIBRARY ${LIBDIR}/aghosty-sdl/jni/SDL/src/main/android/libSDLmain.a)
 		set(SDL_LIBRARY "${SDLMAIN_LIBRARY};${LIBDIR}/aghosty-sdl/libs/armeabi/libSDL.so")
 		set(SDL_LIBPATH ${LIBDIR}/aghosty-sdl/libs/armeabi/)
+	endif()
 
-
 		set(FREETYPE ${LIBDIR}/freetype)
 		set(FREETYPE_INCLUDE_DIRS
 			${LIBDIR}/freetype/include
@@ -762,14 +770,14 @@
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 	set(PLATFORM_LINKLIBS "-lc -lm -lstdc++")
 	if(WITH_ANDROID)
-		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS}  -lGLESv2")
+		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS}  -lGLESv2 -llog")
 	elseif(WITH_GLES)
 		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS}  -lGLESv2 -lEGL")
 	else()
 		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lutil -lpthread")
 	endif()
 
-	if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
+	if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL) AND (NOT WITH_ANDROID))
 		find_package(X11 REQUIRED)
 		find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
 		mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)

Modified: branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_android.cmake
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_android.cmake	2012-07-19 20:19:03 UTC (rev 49070)
+++ branches/soc-2012-swiss_cheese/build_files/cmake/config/blender_android.cmake	2012-07-19 20:46:48 UTC (rev 49071)
@@ -23,14 +23,14 @@
 set(WITH_ASLIB               ON CACHE FORCE BOOL)
 
 
-set(WITH_BUILTIN_GLEW        ON CACHE FORCE BOOL)
+set(WITH_SYSTEM_GLEW        OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          ON CACHE FORCE BOOL)
 set(WITH_PLAYER              ON CACHE FORCE BOOL)
 set(WITH_SDL                 ON CACHE FORCE BOOL)
 set(WITH_GHOST_SDL           ON CACHE FORCE BOOL)
+set(WITH_BULLET              ON CACHE FORCE BOOL)
 
 set(WITH_BUILDINFO           OFF CACHE FORCE BOOL)
-set(WITH_BULLET              OFF CACHE FORCE BOOL)
 set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
 set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
 set(WITH_CYCLES              OFF CACHE FORCE BOOL)

Modified: branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake	2012-07-19 20:19:03 UTC (rev 49070)
+++ branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake	2012-07-19 20:46:48 UTC (rev 49071)
@@ -242,6 +242,10 @@
 	if(WIN32 AND NOT UNIX)
 		link_directories(${PTHREADS_LIBPATH})
 	endif()
+
+	if(WITH_ANDROID AND NOT WITH_GHOST_SDL)
+		link_directories(${ANDROID_APP_LIBPATH})
+	endif()
 endmacro()
 
 macro(setup_liblinks
@@ -371,6 +375,10 @@
 		target_link_libraries(${target} ${PTHREADS_LIBRARIES})
 	endif()
 
+	if(WITH_ANDROID AND NOT WITH_GHOST_SDL)
+		target_link_libraries(${target}  ${ANDROID_APP_LIBRARY})
+	endif()
+
 	target_link_libraries(${target} ${PLATFORM_LINKLIBS})
 endmacro()