[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49967] branches/soc-2012-swiss_cheese/ source: Fix for Android blenderplayer compilation and blender bin path

[Alexander Kuznetsov]

Revision: 49967
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49967
Author:   alexk
Date:     2012-08-17 19:37:20 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
Fix for Android blenderplayer compilation and blender bin path

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/path_util.c
    branches/soc-2012-swiss_cheese/source/blenderplayer/CMakeLists.txt

Modified: branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/path_util.c	2012-08-17 19:29:31 UTC (rev 49966)
+++ branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/path_util.c	2012-08-17 19:37:20 UTC (rev 49967)
@@ -1775,7 +1775,11 @@
 
 #ifdef WITH_ANDROID
 /* probably we should use better method */
-    BLI_strncpy(fullname, "/data/data/org.blender.app/blender", maxlen);
+#ifdef WITH_GHOST_SDL
+	BLI_strncpy(fullname, "/data/data/org.blender.app/blender", maxlen);
+#else
+	BLI_strncpy(fullname, "/data/data/org.blender.play/blender", maxlen);
+#endif
     return;
 	
 #endif

Modified: branches/soc-2012-swiss_cheese/source/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/source/blenderplayer/CMakeLists.txt	2012-08-17 19:29:31 UTC (rev 49966)
+++ branches/soc-2012-swiss_cheese/source/blenderplayer/CMakeLists.txt	2012-08-17 19:37:20 UTC (rev 49967)
@@ -70,7 +70,7 @@
 elseif(WITH_ANDROID)
 message(${CMAKE_CURRENT_BINARY_DIR})
 message(${CMAKE_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}/libmakesdna.so)
-	add_library(blenderplayer SHARED ${CMAKE_CURRENT_BINARY_DIR}/dna.c ./androidfix.c)
+	add_library(blenderplayer SHARED ./androidfix.c)
 else()
 	add_executable(blenderplayer bad_level_call_stubs/stubs.c)
 endif()