diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-15 08:37:50 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-15 08:38:00 +0300 |
| commit | 39ad0a912aee360ff285cb3bdcd5cf351dc3eb3b (patch) | |
| tree | e41c90b0eb4e727e08d8c8cbe9205267a111bf62 | |
| parent | f95f841bf137037e5064cfc7e776a87388a51a1d (diff) | |
Build the vclopengl lib for Android, too, i.e. for all our platforms
Change-Id: I244eb4877801ceb0ff22e8591dccd6b801d00d68
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 7d1da27f0d72..e3715d5d97fe 100644 --- a/Repository.mk +++ b/Repository.mk @@ -352,7 +352,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ vclcanvas \ - $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)),vclopengl) \ + vclopengl \ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ vclplug_gen \ $(if $(ENABLE_TDE),vclplug_tde) \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index a5b0b32d1e38..5f302a83fe69 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -25,9 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ Executable_ui-previewer) \ - $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)), \ - Library_vclopengl \ - ) \ + Library_vclopengl \ )) $(eval $(call gb_Module_add_l10n_targets,vcl,\ |