summaryrefslogtreecommitdiffstats
path: root/sal/cppunittester
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-07 07:58:56 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-09 13:50:19 +0300
commitd2218f8e2683bae4627f1067996158295026d1d6 (patch)
tree98a2ba6885398da5266237f57b2f23ea541947f6 /sal/cppunittester
parentworkaround sal built with _GLIBCXX_DEBUG and cppunit build without it (diff)
downloadcore-d2218f8e2683bae4627f1067996158295026d1d6.tar.gz
core-d2218f8e2683bae4627f1067996158295026d1d6.zip
iOS hacking for cppunittester
We don't need sal/main.h in salinit.cxx as far as I can see. Add stuff to sal/main.h so that we can link an iOS executable that actually will run, and hack the makefile so that cppunittester builds successfully. Of course, a cppunittester executable built here won't be usable for anything interesting as we don't build any dynamic libraries of LibreOffice code for iOS, so there is nothing to pass on the command line to load. But hey, baby steps, experimentation, doing work in the public, commit often, etc...
Diffstat (limited to 'sal/cppunittester')
-rw-r--r--sal/cppunittester/makefile.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 938b63d90ae9..7c43bab6b743 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -35,6 +35,10 @@ ENABLE_EXCEPTIONS = TRUE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
+.ENDIF
+
OBJFILES = $(APP1OBJS)
APP1OBJS = $(OBJ)/cppunittester.obj