diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-01-09 13:41:18 +0100 |
---|---|---|
committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-04-16 15:31:50 +0200 |
commit | 0616b9aa184b37a7595abf0a9f39bc9c6ea96a11 (patch) | |
tree | 567b14bfd8e2aa3c65f6406222a2cabab65f380f | |
parent | 77d9c26a63a190cd4201eaedd9ca72bd123fce76 (diff) |
Enable some more tests and demos for static builds
Change-Id: I6372cd33db2fb72d417ca483d1324fca6947e077
-rw-r--r-- | Repository.mk | 2 | ||||
-rw-r--r-- | registry/Module_registry.mk | 7 | ||||
-rw-r--r-- | vcl/Module_vcl.mk | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/Repository.mk b/Repository.mk index c3afc87196a0..326fcc0edf0f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -67,7 +67,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svptest \ svpclient ) \ $(if $(filter LINUX %BSD SOLARIS,$(OS)), tilebench) \ - $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest) \ + icontest \ vcldemo \ tiledrendering \ mtfdemo \ diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index 90f7833673d8..aa7ec1ab3ecc 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ - $(if $(filter-out $(OS),iOS), \ + $(if $(DISABLE_DYNLOADING),, \ $(if $(ENABLE_MACOSX_SANDBOX),, \ Executable_regmerge \ Executable_regview \ @@ -20,9 +20,8 @@ $(eval $(call gb_Module_add_targets,registry,\ ) \ )) -ifneq ($(OS),iOS) # missing regmerge (see above), needed within test - -ifeq ($(ENABLE_MACOSX_SANDBOX),) # ditto +ifneq (,$(DISABLE_DYNLOADING)) +ifeq ($(ENABLE_MACOSX_SANDBOX),) $(eval $(call gb_Module_add_check_targets,registry, \ CustomTarget_regcompare_test \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index a45b43be22bd..fc38ed5b481a 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(ENABLE_MACOSX_SANDBOX),, \ $(if $(DISABLE_GUI),, \ Executable_ui-previewer)) \ - $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \ + $(if $(filter EMSCRIPTEN LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \ $(if $(DISABLE_GUI),, \ Executable_vcldemo \ Executable_icontest \ @@ -42,8 +42,6 @@ $(eval $(call gb_Module_add_targets,vcl,\ Executable_mtfdemo ))) \ )) -ifeq ($(CROSS_COMPILING)$(DISABLE_DYNLOADING),) - $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter-out ANDROID iOS WNT,$(OS)), \ Executable_svdemo \ @@ -52,8 +50,6 @@ $(eval $(call gb_Module_add_targets,vcl,\ Executable_svpclient) \ )) -endif - $(eval $(call gb_Module_add_l10n_targets,vcl,\ AllLangMoTarget_vcl \ )) |