summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-01-20 17:20:11 +0200
committerTor Lillqvist <tml@iki.fi>2012-01-27 22:43:58 +0200
commit81cf9f5099ca159d703ecc9ed8882bd3d3d1b1e6 (patch)
tree094a0a5da59d8b5b5c044831126933c9eed76a0c
parent4178cb981a373354c0fce853b6f15a71d93a89ae (diff)
Bypass building BASIC and scripting related modules for iOS
Any LO-based app distributed through the App Store can't have scripting or extendability anyway. Sure, this will break the build elsewhere because of missing headers. No big deal, I will take care of that eventually. It isn't as if there would anybody else building for iOS anyway, as far as I know. If there is, please make yourself heard.
-rw-r--r--basctl/Module_basctl.mk4
-rw-r--r--basic/Module_basic.mk4
-rw-r--r--sc/Module_sc.mk9
-rw-r--r--scripting/Module_scripting.mk4
-rw-r--r--vbahelper/Module_vbahelper.mk4
5 files changed, 24 insertions, 1 deletions
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 7ff2a7e117d8..22bf325712e8 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -28,10 +28,14 @@
$(eval $(call gb_Module_Module,basctl))
+ifneq (IOS,$(OS))
+
$(eval $(call gb_Module_add_targets,basctl,\
AllLangResTarget_basctl \
Library_basctl \
Package_xml \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index 0fafc6c5dc8e..a04f9f334607 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -28,6 +28,8 @@
$(eval $(call gb_Module_Module,basic))
+ifneq (IOS,$(OS))
+
$(eval $(call gb_Module_add_targets,basic,\
AllLangResTarget_sb \
Library_sb \
@@ -38,4 +40,6 @@ $(eval $(call gb_Module_add_check_targets,basic,\
CppunitTest_basic_scanner \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index d7d28ef03d47..112fa40a80c6 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -29,11 +29,18 @@ $(eval $(call gb_Module_add_targets,sc,\
Library_scd \
Library_scfilt \
Library_scui \
- Library_vbaobj \
Package_uiconfig \
Package_xml \
))
+ifneq (IOS,$(OS))
+
+$(eval $(call gb_Module_add_targets,sc,\
+ Library_vbaobj \
+))
+
+endif
+
$(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_ucalc \
CppunitTest_sc_filters_test \
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 252a1dfaad8f..3b6166729874 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -28,6 +28,8 @@
$(eval $(call gb_Module_Module,scripting))
+ifneq (IOS,$(OS))
+
$(eval $(call gb_Module_add_targets,scripting,\
$(if $(SOLAR_JAVA),\
Jar_HelloWorld \
@@ -56,4 +58,6 @@ $(eval $(call gb_Module_add_targets,scripting,\
Zip_ScriptsPython \
))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk
index d272fb11e1ee..fcf046e04c32 100644
--- a/vbahelper/Module_vbahelper.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -28,6 +28,8 @@
$(eval $(call gb_Module_Module,vbahelper))
+ifneq (IOS,$(OS))
+
# the targets to be inserted are their file names without .mk extension
$(eval $(call gb_Module_add_targets,vbahelper,\
Library_vbahelper \
@@ -44,4 +46,6 @@ $(eval $(call gb_Module_add_targets,vbahelper,\
#$(eval $(call gb_Module_add_subsequentcheck_targets,vbahelper,\
#))
+endif
+
# vim: set noet sw=4 ts=4: