correct issue for compiling ios

Change-Id: I0b55752383af8e8d8e10ccf09dc515edf93ee41c
Signed-off-by: Angelo Mantellini (manangel) <[email protected]>

diff --git a/Common/Info.plist b/Common/Info.plist
index 8e33963..25ef921 100644 (file)
--- a/Common/Info.plist
+++ b/Common/Info.plist
@@ -34,9 +34,9 @@
                                <string>waw</string>
                                <string>wma</string>
                        </array>
-                       <key>CFBundleTypeIconFile</key>
-                       <string>document.icns</string>
-                       <key>CFBundleTypeName</key>
+                        <key>CFBundleTypeIconFile</key>
+                        <string>Viper.icns</string>
+                        <key>CFBundleTypeName</key>
                        <string>Audio file</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
@@ -162,7 +162,7 @@
                                <string>utf</string>
                        </array>
                        <key>CFBundleTypeIconFile</key>
-                       <string>document.icns</string>
+                        <string>Viper.icns</string>
                        <key>CFBundleTypeName</key>
                        <string>Subtitles file</string>
                        <key>CFBundleTypeRole</key>
@@ -176,7 +176,7 @@
        <key>CFBundleExecutable</key>
        <string>@EXECUTABLE@</string>
        <key>CFBundleIconFile</key>
-       <string>Cisco.icns</string>
+        <string>Viper.icns</string>
        <key>CFBundleIdentifier</key>
        <string>com.cisco.@EXECUTABLE@</string>
        <key>CFBundleInfoDictionaryVersion</key>

diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt
index ada76ad..9135339 100644 (file)
--- 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 c71462e..9f8f957 100644 (file)
--- 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 4b8b3fd..2c4529f 100644 (file)
--- 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 1c791ba..a86f73c 100644 (file)
--- 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 73ac6db..b2aa955 100644 (file)
--- 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 e7de0cd..1b8bbdd 100644 (file)
--- 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
 {

diff --git a/viper.pro b/viper.pro
index 836eab9..257a077 100644 (file)
--- a/viper.pro
+++ b/viper.pro
@@ -288,8 +288,12 @@ unix:!macx:!android {
 
 macx:!ios {
 
+    QMAKE_INFO_PLIST = $$COMMON/Info.plist
+    ICON = $$COMMON/Viper.icns
+    QMAKE_RPATHDIR += /usr/local/lib
     INCLUDEPATH += /usr/local/include
     INCLUDEPATH += /usr/local/include/libdash
+    INCLUDEPATH += $$[QT_HOST_PREFIX]/include/
     equals(TRANSPORT_LIBRARY, "HICNET") {
         LIBS += -L"/usr/local/lib" -framework CoreServices -ldash -lavformat -lavutil -lavcodec -lboost_system -lboost_regex -lswscale -lhicnet -lssl -lcrypto
                DEFINES += "HICNET=ON"