summaryrefslogtreecommitdiff
path: root/sal/osl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-10 14:43:03 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-10 14:43:03 +0300
commit6ab96ee3d57f1bdf79f58f02a1f2a455f72f3a5a (patch)
tree50d7baa0fc07d7f1cccd7a7f8c9e7492e98bb699 /sal/osl
parent7e8ce369a76f0f9bda24a24a998137fbc2dd8b23 (diff)
Do build sal unit tests for iOS, too
We can't run them in the normal way, but we build the tests as static archives, which we link into the single sal_cppunittester_all executable. (Work in progress, so far just a part of the tests are linked into it.) There is no makefilery yet to actually construct a complete iOS app bundle (.app directory), so just copy (in this case) the sal_cppunittester_all iOS executable on top of the executbale some dummy iOS app you build in Xcode... works fine, can be debugged that way.
Diffstat (limited to 'sal/osl')
-rw-r--r--sal/osl/unx/makefile.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index cb566aeb1d60..2ec11e16f58b 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -49,6 +49,10 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
+.IF "$(OS)" == "IOS"
+CFLAGSCXX+=-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
+.ENDIF
+
# --- Files --------------------------------------------------------
SLOFILES= \
@@ -113,7 +117,7 @@ OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/readwrite_helper.obj
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
SLOFILES += $(SLO)$/osxlocale.obj
.ENDIF