diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-03-14 15:09:15 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 01:27:48 +0200 |
| commit | e56b1bf7a5203b3dc6ab5f4f9f93c2199d9f7723 (patch) | |
| tree | 022a4592a804972dc799605cca7cf30f3f70ca4e /basebmp | |
| parent | ccbdbacc601c9802ae72fe49231fd90c3417957f (diff) | |
gnumake4: basebmp: add necessary workarounds for SunCC [hg:3754657d8ff7]
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/CppunitTest_basebmp.mk | 10 | ||||
| -rw-r--r-- | basebmp/Library_basebmp.mk | 13 | ||||
| -rw-r--r-- | basebmp/Module_basebmp.mk | 1 |
3 files changed, 9 insertions, 15 deletions
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index 878b14bf8d3a..ae4b6bbe0463 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -39,16 +39,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \ basebmp/test/tools \ )) -# TODO -# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail -# if compiled with default -xalias_level (and optimization level -xO3) -#.IF "$(OS)"=="SOLARIS" -# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx -#.IF "$(CCNUMVER)"!="00050005" -#CDEFS+=-xalias_level=compatible -#.ENDIF -#.ENDIF - $(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \ basebmp \ sal \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 703ddc396494..a835c417d214 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_set_defs,basebmp,\ -DBASEBMP_DLLIMPLEMENTATION \ )) -# add libraries to be linked to basebmp; again these names need to be given as -# specified in Repository.mk $(eval $(call gb_Library_add_linked_libs,basebmp,\ sal \ basegfx \ @@ -50,12 +48,19 @@ $(eval $(call gb_Library_add_linked_libs,basebmp,\ $(gb_STDLIBS) \ )) -# add all source files that shall be compiled with exceptions enabled -# the name is relative to $(SRCROOT) and must not contain an extension +ifeq ($(OS),SOLARIS) +$(eval $(call gb_Library_add_cxxobjects,basebmp, \ + basebmp/source/bitmapdevice \ + basebmp/source/debug \ + basebmp/source/polypolygonrenderer \ + , $(gb_COMPILEROPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) -xalias_level=compatible \ +)) +else $(eval $(call gb_Library_add_exception_objects,basebmp,\ basebmp/source/bitmapdevice \ basebmp/source/debug \ basebmp/source/polypolygonrenderer \ )) +endif # vim: set noet sw=4 ts=4: diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk index 0329d1cc358f..7ac5d945ffdd 100644 --- a/basebmp/Module_basebmp.mk +++ b/basebmp/Module_basebmp.mk @@ -36,5 +36,4 @@ $(eval $(call gb_Module_add_check_targets,basebmp,\ CppunitTest_basebmp \ )) - # vim: set noet sw=4 ts=4: |