Merge branch 'sdl_android' of github.com:pelya/commandergenius into android3

project/jni/application/fheroes2/AndroidAppSettings.cfg

@@ -3,7 +3,7 @@
 AppSettingVersion=19
 
 # Debuggable Build? (y) or (n):
-Debuggable=true
+Debuggable=false
 
 # libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2)
 LibSdlVersion=1.2
@@ -174,7 +174,7 @@ FirstStartMenuOptions=''
 
 # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
 # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI=n
+MultiABI=all
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=32

project/jni/application/uqm-hd/AndroidAppSettings.cfg

@@ -170,10 +170,10 @@ MultiABI=y
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=07003
+AppVersionCode=07004
 
 # Application user-visible version name (string)
-AppVersionName="0.7.0.03"
+AppVersionName="0.7.0.04"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n

project/jni/application/vcmi/AndroidAppSettings.cfg

@@ -2,6 +2,9 @@
 
 AppSettingVersion=19
 
+# Debuggable Build? (y) or (n):
+Debuggable=false
+
 # libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2)
 LibSdlVersion=1.2
 

project/jni/application/vcmi/Makefile

@@ -82,13 +82,16 @@ $(OBJS_MINIZIP): out/%.o: %.c
 	$< -o $@"
 
 LINK_BOOST_LIBS:=-L../../boost/lib/arm-linux-androideabi-4.6 \
-	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lboost_program_options -lgnustl_static
+	-lboost_filesystem -lboost_iostreams -lboost_system -lboost_thread -lboost_program_options -lboost_locale -lgnustl_static
+
+LINK_ICU:=-L../../libiconv-libicu/armeabi-v7a \
+        -licuuc
 
 LINK_LIB= \
 	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 GCCVER=$(GCC_VERSION) ../setEnvironment-armeabi-v7a.sh sh -c \
 	"$(GCC_PREFIX)-g++ \
 	$^ -o $@ \
-	-shared \$$LDFLAGS -L. $(LINK_BOOST_LIBS)" && \
+	-shared \$$LDFLAGS -L. $(LINK_BOOST_LIBS) $(LINK_ICU) " && \
 	cp $@ debug/$@ && \
 	$(GCC_PREFIX)-strip $@
 

project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp

@@ -657,7 +657,7 @@ namespace boost { namespace property_tree
     template<class Type> inline
     Type basic_ptree<K, D, C>::get_value() const
     {
-	return get_value<Type>(
+        return get_value<Type>(
             typename translator_between<data_type, Type>::type());
     }
 

project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp

@@ -16,10 +16,6 @@
 #include <cstdlib>      // For std::size_t
 #include <new>          // For placement new
 
-#ifdef ANDROID
-#include <android/log.h>
-#endif
-
 // On MSVC, disable "conditional expression is constant" warning (level 4). 
 // This warning is almost impossible to avoid with certain types of templated code
 #ifdef _MSC_VER
@@ -600,14 +596,10 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml
                 // Allocate
                 std::size_t alloc_size = sizeof(header) + (2 * BOOST_PROPERTY_TREE_RAPIDXML_ALIGNMENT - 2) + pool_size;     // 2 alignments required in worst case: one for header, one for actual allocation
                 char *raw_memory = allocate_raw(alloc_size);
-
                     
                 // Setup new pool in allocated memory
                 char *pool = align(raw_memory);
-                //header *new_header = reinterpret_cast<header *>(pool);
+                header *new_header = reinterpret_cast<header *>(pool);
-		header *new_header = (header *)((void*)pool);
-
-
                 new_header->previous_begin = m_begin;
                 m_begin = raw_memory;
                 m_ptr = pool + sizeof(header);

project/jni/boost/include/boost/utility/addressof.hpp

@@ -36,12 +36,8 @@ template<class T> struct addressof_impl
 {
     static inline T * f( T & v, long )
     {
-	T *ptr;
+        return reinterpret_cast<T*>(
-/*        return reinterpret_cast<T*>(
+            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));
-            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));*/
-	ptr = (T*)(&v);
-//	memcpy(&ptr, &v, sizeof(T*));
-	return ptr;
     }
 
     static inline T * f( T * v, int )

project/jni/boost_locale

@@ -0,0 +1 @@
+/home/gerstrong/Desktop/commandergenius/project/jni/boost

project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c

@@ -388,10 +388,16 @@ SDL_Surface *ANDROID_SetVideoMode(_THIS, SDL_Surface *current,
 		SDL_ANDROID_sWindowHeight = SDL_ANDROID_sRealWindowHeight;
 
 		SDL_ANDROID_ForceClearScreenRectAmount = 0;
-		if( SDL_ANDROID_ScreenKeep43Ratio &&
+		if( SDL_ANDROID_ScreenKeep43Ratio )
-			(float)width / (float)height < (float)SDL_ANDROID_sWindowWidth / (float)SDL_ANDROID_sWindowHeight )
 		{
-			SDL_ANDROID_sWindowWidth = (SDL_ANDROID_sFakeWindowWidth * SDL_ANDROID_sRealWindowHeight) / SDL_ANDROID_sFakeWindowHeight;
+			if( (float)width / (float)height < (float)SDL_ANDROID_sWindowWidth / (float)SDL_ANDROID_sWindowHeight )
+				SDL_ANDROID_sWindowWidth = (SDL_ANDROID_sFakeWindowWidth * SDL_ANDROID_sRealWindowHeight) / SDL_ANDROID_sFakeWindowHeight;
+			else
+				// Force 4:3 ratio, with black borders at the left/right,
+				// this is needede for Uae4all2, which has 640x256 video mode,
+				// and expects those 256 pixels to stretch 2x height like on a TV interlaced display.
+				SDL_ANDROID_sWindowWidth = SDL_ANDROID_sWindowHeight * 4 / 3;
+
 			SDL_ANDROID_TouchscreenCalibrationWidth = SDL_ANDROID_sWindowWidth;
 			SDL_ANDROID_ForceClearScreenRectAmount = 2;
 		}