diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Executable_icontest.mk | 5 | ||||
| -rw-r--r-- | vcl/Executable_mtfdemo.mk | 5 | ||||
| -rw-r--r-- | vcl/Executable_ui-previewer.mk | 5 | ||||
| -rw-r--r-- | vcl/Executable_vcldemo.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_desktop_detector.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 7 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 6 |
8 files changed, 17 insertions, 23 deletions
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index 11cc69d086fc..e9a30f8a2076 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -25,10 +25,9 @@ $(eval $(call gb_Executable_use_static_libraries,icontest,\ vclmain \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,icontest,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lGL \ -lX11 \ diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk index 52af4a309040..01156f82296a 100644 --- a/vcl/Executable_mtfdemo.mk +++ b/vcl/Executable_mtfdemo.mk @@ -40,10 +40,9 @@ $(eval $(call gb_Executable_use_static_libraries,mtfdemo,\ vclmain \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,mtfdemo,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lGL \ -lX11 \ diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 9aa4fa3bb0cb..4ef1b05c9fcb 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -34,10 +34,9 @@ $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\ vcl/source/uipreviewer/previewer \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,ui-previewer,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lGL \ -lX11 \ diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index c86c7faf2965..3e05cf42200e 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -46,10 +46,9 @@ $(eval $(call gb_Executable_use_static_libraries,vcldemo,\ vclmain \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,vcldemo,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lGL \ -lX11 \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 6baf4abcb346..3edd0015e243 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -63,10 +63,9 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ vcl/unx/generic/desktopdetect/desktopdetector \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,desktop_detector,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ )) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 010568ac8974..b54642feb18a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\ )) $(eval $(call gb_Library_use_externals,vcl,\ - $(if $(filter LINUX MACOSX,$(OS)), \ + $(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \ curl) \ jpeg \ $(if $(filter-out IOS WNT,$(OS)), \ @@ -721,10 +721,9 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc)) endif -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,vcl,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -lGL \ -lX11 \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 607d13edf74d..1480504c72bb 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ StaticLibrary_vclmain \ $(if $(ENABLE_HEADLESS),, \ Executable_ui-previewer) \ - $(if $(filter LINUX MACOSX WNT,$(OS)), \ + $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \ Executable_outdevgrind \ $(if $(ENABLE_HEADLESS),, \ Executable_vcldemo \ diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 02be8e2f76de..9ae1cd1409a3 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -142,11 +142,11 @@ public: maIntroBW.Filter(BMP_FILTER_EMBOSS_GREY); InitRenderers(); - mnSegmentsX = rtl::math::round(sqrt(maRenderers.size()), 0, + mnSegmentsX = rtl::math::round(std::sqrt(maRenderers.size()), 0, rtl_math_RoundingMode_Up); - mnSegmentsY = rtl::math::round(sqrt(maRenderers.size()), 0, + mnSegmentsY = rtl::math::round(std::sqrt(maRenderers.size()), 0, rtl_math_RoundingMode_Down); - mnSegmentsY = floor(sqrt(maRenderers.size())); + mnSegmentsY = floor(std::sqrt(maRenderers.size())); } OUString getRendererList(); |