From 630ee68b05fb6247fd62da73024efa0d4789877d Mon Sep 17 00:00:00 2001 From: Sacha Date: Sun, 24 Feb 2013 22:17:52 +1000 Subject: [PATCH] Build fix for iOS. Now compiles. --- CMakeLists.txt | 4 +++- Common/ChunkFile.h | 4 ++++ ios/ViewController.mm | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f88157a944..5da94fb773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,7 +132,9 @@ if(NOT MSVC) add_definitions(-msse2) endif() - if(APPLE) + if(IOS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++") + elseif(APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7.0) diff --git a/Common/ChunkFile.h b/Common/ChunkFile.h index 0344483514..8bf1c82232 100644 --- a/Common/ChunkFile.h +++ b/Common/ChunkFile.h @@ -34,8 +34,12 @@ #include #include #ifndef __SYMBIAN32__ +#ifdef IOS +#include +#else #include #endif +#endif #include "Common.h" #include "FileUtil.h" diff --git a/ios/ViewController.mm b/ios/ViewController.mm index 996ba92c50..e979295676 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -13,10 +13,9 @@ #include "file/zip_read.h" #include "input/input_state.h" #include "net/resolve.h" -#include "ui_atlas.h" #include "ui/screen.h" -#include "Config.h" +#include "Core/Config.h" #include "gfx_es2/fbo.h" #define IS_IPAD() ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad)