diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa476ac1f..1569a45d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ elseif(WIN32)
     include(platforms/win/configure.cmake)
 elseif(APPLE)
     include(platforms/macosx/configure.cmake)
-elseif(UNIX)
+elseif(UNIX AND NOT ANDROID)
     include(platforms/unix/configure.cmake)
 elseif(ANDROID)
     include(platforms/android/configure.cmake)
diff --git a/platforms/android/configure.cmake b/platforms/android/configure.cmake
index abbb5f277..96d54b18d 100644
--- a/platforms/android/configure.cmake
+++ b/platforms/android/configure.cmake
@@ -1,2 +1,3 @@
 add_definitions(-DANDROID -DLINUX)
-add_definitions(-D_STLP_USE_SIMPLE_NODE_ALLOC -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS)  
+add_definitions(-D_STLP_USE_SIMPLE_NODE_ALLOC -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
diff --git a/platforms/macosx/configure.cmake b/platforms/macosx/configure.cmake
index d92eb8985..1dae9959f 100644
--- a/platforms/macosx/configure.cmake
+++ b/platforms/macosx/configure.cmake
@@ -1,5 +1,5 @@
 add_definitions(-DLINUX)
 add_definitions(-DUSERDIR=".wagic") 
 add_definitions(-DRESDIR="Res")
-set(CMAKE_CXX_FLAGS "-stdlib=libc++ -std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++0x")
 set(CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
diff --git a/platforms/unix/configure.cmake b/platforms/unix/configure.cmake
index 1db0ea566..318de04eb 100644
--- a/platforms/unix/configure.cmake
+++ b/platforms/unix/configure.cmake
@@ -1,4 +1,4 @@
 add_definitions(-DLINUX)
 add_definitions(-DUSERDIR=".wagic") 
 add_definitions(-DRESDIR="Res")
-set(CMAKE_CXX_FLAGS "-std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
diff --git a/projects/mtg/CMakeLists.txt b/projects/mtg/CMakeLists.txt
index b5494cca6..de238e29e 100644
--- a/projects/mtg/CMakeLists.txt
+++ b/projects/mtg/CMakeLists.txt
@@ -169,20 +169,17 @@ elseif(backend_sdl)
         add_executable(wagic ${MTG_generic_src} ${MTG_sdl_src} src/TestSuiteAI.cpp src/AIPlayerBakaB.cpp)
         target_link_libraries(wagic  ${JGE_LIBRARY} ${SDL2_LIBRARY} ${OPENGL_LIBRARIES} ${TINYXML_LIBRARIES} ${HGE_LIBRARY} ${ZLIB_LIBRARIES})
     elseif(ANDROID)
-        include_directories(${MTG_INCLUDE_DIRS} ${JGE_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR} 
-            ${BOOST_INCLUDE_DIRS} ${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR})
+        include_directories(${MTG_INCLUDE_DIRS} ${JGE_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR} ${BOOST_INCLUDE_DIRS} ${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR})
         #we should try to get rid of this hack
         add_library(wagic SHARED ${MTG_generic_src} ${MTG_android_sdl_src} src/TestSuiteAI.cpp)
-        target_link_libraries(wagic  ${JGE_LIBRARY} ${SDL2_LIBRARY} ${OPENGL_LIBRARIES} ${TINYXML_LIBRARIES} 
-            ${HGE_LIBRARY})
+        target_link_libraries(wagic  ${JGE_LIBRARY} ${SDL2_LIBRARY} ${OPENGL_LIBRARIES} ${TINYXML_LIBRARIES} ${HGE_LIBRARY} ${ZLIB_LIBRARIES})
     elseif(WIN32)
         include_directories(${EXTRA_INCLUDE_DIR} ${MTG_INCLUDE_DIRS} ${JGE_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR} 
             ${Boost_INCLUDE_DIRS} ${UNZIP_INCLUDE_DIR} ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR}
             ${ZLIB_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/include)
         add_executable(wagic ${MTG_generic_src} ${MTG_sdl_src} src/TestSuiteAI.cpp src/AIPlayerBakaB.cpp)
         link_directories(${Boost_LIBRARY_DIR} ${SDL2_LIBRARY_DIR})
-        target_link_libraries(wagic  ${JGE_LIBRARY} ${SDL2_LIBRARY} ${OPENGL_LIBRARIES} ${TINYXML_LIBRARIES} 
-            ${BOOST_date_time} ${HGE_LIBRARY} ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/lib/fmodvc.lib ${ZLIB_LIBRARIES})
+        target_link_libraries(wagic  ${JGE_LIBRARY} ${SDL2_LIBRARY} ${OPENGL_LIBRARIES} ${TINYXML_LIBRARIES} ${BOOST_date_time} ${HGE_LIBRARY} ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/lib/fmodvc.lib ${ZLIB_LIBRARIES})
     endif()
 elseif(backend_psp)
     if(PSP)
diff --git a/projects/mtg/src/SDLmain.cpp b/projects/mtg/src/SDLmain.cpp
index 6b1d9d95f..92ab1fa9d 100644
--- a/projects/mtg/src/SDLmain.cpp
+++ b/projects/mtg/src/SDLmain.cpp
@@ -660,8 +660,8 @@ bool SdlApp::OnInit()
 	DebugTrace("Video Display : h " << currentDisplayMode.h << ", w " << currentDisplayMode.w);
 
 #if (defined ANDROID) || (defined IOS)
-	window_w = pVideoInfo->current_w;
-	window_h = pVideoInfo->current_h;
+	window_w = currentDisplayMode.w;
+	window_h = currentDisplayMode.h;
 #else
 	window_w = ACTUAL_SCREEN_WIDTH;
 	window_h = ACTUAL_SCREEN_HEIGHT;