diff options
Diffstat (limited to 'libdash')
-rw-r--r-- | libdash/CMakeLists.txt | 12 | ||||
-rw-r--r-- | libdash/source/helpers/Block.h | 2 | ||||
-rw-r--r-- | libdash/source/helpers/BlockStream.h | 4 | ||||
-rw-r--r-- | libdash/source/helpers/Path.h | 5 | ||||
-rw-r--r-- | libdash/source/helpers/String.h | 4 | ||||
-rw-r--r-- | libdash/source/helpers/Time.h | 1 |
6 files changed, 26 insertions, 2 deletions
diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt index ada76ad8..91353390 100644 --- a/libdash/CMakeLists.txt +++ b/libdash/CMakeLists.txt @@ -12,6 +12,12 @@ if(ANDROID_API) set(CURL_LIBRARIES "$ENV{DISTILLERY_ROOT_DIR}/usr/lib/libcurl.a" "$ENV{DISTILLERY_ROOT_DIR}/usr/lib/libcurl-library.a") set(ANDROID_LIBRARIES "${ANDROID_NDK}/platforms/android-23/arch-arm/usr/lib/libz.a" "$ENV{NDK}/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ENV{ABI}/libgnustl_shared.so" "${ANDROID_NDK}/platforms/android-23/arch-arm/usr/lib/liblog.so") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${ANDROID_C_FLAGS} -std=c++0x -g -DLOG_BUILD") +elseif (COMPILE_FOR_IOS) + set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") + find_package(LibXml2 REQUIRED) + find_host_package(OpenSSL REQUIRED) + find_package(ZLIB REQUIRED) + find_host_package(CURL REQUIRED) else () set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") find_package(LibXml2 REQUIRED) @@ -179,7 +185,11 @@ include_directories(${WLIB_INCLUDE_DIRS}) include_directories(${CURL_INCLUDE_DIRS}) include_directories(include) -add_library(dash SHARED ${SOURCE_FILES}) +if (COMPILE_FOR_IOS OR COMPILE_FOR_IOS_SIMULATOR) + add_library(dash STATIC ${SOURCE_FILES}) +else() + add_library(dash SHARED ${SOURCE_FILES}) +endif() set_target_properties(dash PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries(dash ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${CURL_LIBRARIES} ${ANDROID_LIBRARIES} ${CURL_LIBRARIES}) message("libxml ${LIBXML2_LIBRARIES} ${LIBXML2_INCLUDE_DIR}") diff --git a/libdash/source/helpers/Block.h b/libdash/source/helpers/Block.h index c71462e8..9f8f9577 100644 --- a/libdash/source/helpers/Block.h +++ b/libdash/source/helpers/Block.h @@ -13,6 +13,8 @@ #define __BLOCK_H__ #include "config.h" +#include <stddef.h> +#include <stdlib.h> namespace dash { diff --git a/libdash/source/helpers/BlockStream.h b/libdash/source/helpers/BlockStream.h index 4b8b3fd5..2c4529f0 100644 --- a/libdash/source/helpers/BlockStream.h +++ b/libdash/source/helpers/BlockStream.h @@ -13,7 +13,9 @@ #define __BLOCKSTREAM_H__ #include "config.h" - +#include <stddef.h> +#include <stdint.h> +#include <deque> #include "Block.h" namespace dash diff --git a/libdash/source/helpers/Path.h b/libdash/source/helpers/Path.h index 1c791baa..a86f73c1 100644 --- a/libdash/source/helpers/Path.h +++ b/libdash/source/helpers/Path.h @@ -13,6 +13,11 @@ #define PATH_H_ #include "config.h" +#include <stdlib.h> +#include <vector> +#include <string> +#include <iostream> +#include <sstream> namespace dash { diff --git a/libdash/source/helpers/String.h b/libdash/source/helpers/String.h index 73ac6db8..b2aa955a 100644 --- a/libdash/source/helpers/String.h +++ b/libdash/source/helpers/String.h @@ -13,6 +13,10 @@ #define STRING_H_ #include "config.h" +#include <string> +#include <iostream> +#include <sstream> +#include <vector> namespace dash { diff --git a/libdash/source/helpers/Time.h b/libdash/source/helpers/Time.h index e7de0cd9..1b8bbddc 100644 --- a/libdash/source/helpers/Time.h +++ b/libdash/source/helpers/Time.h @@ -14,6 +14,7 @@ #include <time.h> #include "config.h" +#include <string> namespace dash { |