diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-02-16 09:09:14 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-02-16 15:25:37 +0200 |
commit | a1fe0a772f40c221f5d788192543352b302ac4e8 (patch) | |
tree | 9d386d629ffc7239913b0b11e2896aaa18d70b93 /sax | |
parent | 3675980cc1804e842b955b656fc03133ffbecea8 (diff) |
Use the same simple lo_main() on iOS as on Android
Let's do the iOS specific stuff in separate main() source
file(s). Don't attempt to build complete iOS programs using normal
LibreOffice mechanisms, it will work for only the very lowest level
unit tests anyway, because of static linking and the circularish
UNO/URE/bootstrap/whatnot (run-time) dependencies between different
parts of the code.
We thus can't build the various iOS-specific *_cppunittester_all unit
test executables any more. Corresponding unit tests (and more complex
ones) for iOS will have to be done in a different way.
Diffstat (limited to 'sax')
-rw-r--r-- | sax/Executable_sax_cppunittester_all.mk | 64 | ||||
-rw-r--r-- | sax/Module_sax.mk | 6 |
2 files changed, 0 insertions, 70 deletions
diff --git a/sax/Executable_sax_cppunittester_all.mk b/sax/Executable_sax_cppunittester_all.mk deleted file mode 100644 index 0ec10a8a379d..000000000000 --- a/sax/Executable_sax_cppunittester_all.mk +++ /dev/null @@ -1,64 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,sax_cppunittester_all)) - -$(eval $(call gb_Executable_set_include,sax_cppunittester_all,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sax/inc \ -)) - -$(eval $(call gb_Executable_add_defs,sax_cppunittester_all,\ - $(gb_OBJCXXFLAGS) \ -)) - -$(eval $(call gb_Executable_add_linked_libs,sax_cppunittester_all,\ - cppu \ - cppunit \ - sal \ - sal_textenc \ - sax \ - $(gb_STDLIBS) \ - objc \ -)) - -$(eval $(call gb_Executable_use_externals,sax_cppunittester_all,\ - uikit \ - foundation \ -)) - -$(eval $(call gb_Executable_add_exception_objects,sax_cppunittester_all,\ - sax/qa/cppunit/sax_cppunittester_all \ -)) - -$(eval $(call gb_Executable_add_api,sax_cppunittester_all,\ - offapi \ - udkapi \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk index 9276e9823fa2..c76d0c826ea4 100644 --- a/sax/Module_sax.mk +++ b/sax/Module_sax.mk @@ -39,10 +39,4 @@ $(eval $(call gb_Module_add_check_targets,sax,\ CppunitTest_sax \ )) -ifeq ($(OS),IOS) -$(eval $(call gb_Module_add_targets,sax,\ - Executable_sax_cppunittester_all \ -)) -endif - # vim: set noet sw=4 ts=4: |