diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-10 12:31:12 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-10 12:31:12 +0300 |
| commit | 1a261bd0a5f86189215617e70a8e921a8b2751c3 (patch) | |
| tree | e078d6bfcdc87fd81fc4f81d2cf9b06ca8c9165f | |
| parent | e21f6e3838a64f6c2517479d021e943e2ffcab94 (diff) | |
Build icontest for OS X, too. Does not work at all, though
Change-Id: Id1c82638f12514f55f297ec5e4a07444849175ce
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | vcl/Executable_icontest.mk | 6 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index beb2c686b338..b521ef66e79b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -99,7 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ) \ uri-encode \ ui-previewer \ - $(if $(filter LINUX WNT,$(OS)), \ + $(if $(filter LINUX MACOSX WNT,$(OS)), \ icontest) \ vcldemo \ tiledrendering \ diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index 83ba64875a50..d7863861efd7 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -33,6 +33,12 @@ $(eval $(call gb_Executable_add_libs,icontest,\ opengl32.lib \ )) +else ifeq ($(OS),MACOSX) + +$(eval $(call gb_Executable_add_libs,icontest,\ + -framework OpenGL \ +)) + endif $(eval $(call gb_Executable_use_static_libraries,icontest,\ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index fa827d31e21b..51c5d3ff0ab1 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ Executable_ui-previewer \ - $(if $(filter LINUX WNT,$(OS)), \ + $(if $(filter LINUX MACOSX WNT,$(OS)), \ Executable_icontest)) \ $(if $(filter-out ANDROID IOS WNT,$(OS)), \ Executable_svdemo \ |