Merge pull request #9 from nventive/dev/djo/calcmanager-ios

Build CalcManager on iOS

src/CalcManager/CCalcManager.h

@@ -40,7 +40,7 @@ struct CalculatorManager_CreateParams {
 	GetCEngineStringFunc GetCEngineString;
 };
 
-#if defined(__EMSCRIPTEN__)
+#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
 #define DLL_EXPORT 
 #else
 #define DLL_EXPORT __declspec(dllexport)

src/CalcManager/CalculatorManager.cpp

@@ -14,7 +14,7 @@ static constexpr size_t SERIALIZED_NUMBER_MINSIZE = 3;
 
 // Converts Memory Command enum value to unsigned char,
 // while ignoring Warning C4309: 'conversion' : truncation of constant value
-#if defined(__EMSCRIPTEN__)
+#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
 #define MEMORY_COMMAND_TO_UNSIGNED_CHAR(c) static_cast<unsigned char>(c)
 #else
 #define MEMORY_COMMAND_TO_UNSIGNED_CHAR(c) __pragma(warning(push)) __pragma(warning(disable : 4309)) static_cast<unsigned char>(c) __pragma(warning(pop))

src/CalcManager/CalculatorVector.h

@@ -10,7 +10,7 @@
 #include "Ratpack/CalcErr.h"
 #include <stdexcept> // for std::out_of_range
 
-#if !defined(__EMSCRIPTEN__)
+#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
 #include <winerror.h>
 #include <sal.h>     // for SAL
 #endif

src/CalcManager/build_ios.sh

@@ -0,0 +1,35 @@
+xcrun -sdk iphoneos clang \
+    -x c++ \
+    -arch arm64 \
+    -std=c++1z \
+    -stdlib=libc++ \
+    -c \
+	CEngine/*.cpp RatPack/*.cpp *.cpp -I.  
+
+mkdir bin
+mkdir bin/arm64
+
+libtool \
+    -static \
+    *.o \
+    -o bin/arm64/libCalcManager.a
+
+rm *.o
+
+clang \
+    -x c++ \
+    -arch x86_64 \
+    -std=c++1z \
+    -stdlib=libc++ \
+    -c \
+	CEngine/*.cpp RatPack/*.cpp *.cpp -I.  
+
+mkdir bin/x86_64
+
+libtool \
+    -static \
+    *.o \
+    -o bin/x86_64/libCalcManager.a
+
+rm *.o
+

src/CalcManager/compat.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(__EMSCRIPTEN__)
+#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
 
 #define HRESULT long
 #define _In_opt_

src/CalcManager/pch.h

@@ -18,7 +18,7 @@
 #include <unordered_map>
 #include <vector>
 
-#if !defined(__EMSCRIPTEN__)
+#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
 #include <ppltasks.h>
 #include <winerror.h>
 #include <intsafe.h>