Kaydet (Commit) 1a261bd0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Build icontest for OS X, too. Does not work at all, though

Change-Id: Id1c82638f12514f55f297ec5e4a07444849175ce
üst e21f6e38
...@@ -99,7 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ...@@ -99,7 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
) \ ) \
uri-encode \ uri-encode \
ui-previewer \ ui-previewer \
$(if $(filter LINUX WNT,$(OS)), \ $(if $(filter LINUX MACOSX WNT,$(OS)), \
icontest) \ icontest) \
vcldemo \ vcldemo \
tiledrendering \ tiledrendering \
......
...@@ -33,6 +33,12 @@ $(eval $(call gb_Executable_add_libs,icontest,\ ...@@ -33,6 +33,12 @@ $(eval $(call gb_Executable_add_libs,icontest,\
opengl32.lib \ opengl32.lib \
)) ))
else ifeq ($(OS),MACOSX)
$(eval $(call gb_Executable_add_libs,icontest,\
-framework OpenGL \
))
endif endif
$(eval $(call gb_Executable_use_static_libraries,icontest,\ $(eval $(call gb_Executable_use_static_libraries,icontest,\
......
...@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ ...@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \ StaticLibrary_vclmain \
Executable_ui-previewer \ Executable_ui-previewer \
$(if $(filter LINUX WNT,$(OS)), \ $(if $(filter LINUX MACOSX WNT,$(OS)), \
Executable_icontest)) \ Executable_icontest)) \
$(if $(filter-out ANDROID IOS WNT,$(OS)), \ $(if $(filter-out ANDROID IOS WNT,$(OS)), \
Executable_svdemo \ Executable_svdemo \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment