diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:48:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:48:34 +0000 |
| commit | ea23c78253885d95910d601db54a868806576975 (patch) | |
| tree | 4d04ecfe2a867e515253cc3177f3542352974168 /slideshow | |
| parent | c2677ad22a87315796ffcb6094f9ef0ba8e80cef (diff) | |
CWS-TOOLING: integrate CWS hr58
2008-12-29 16:47:08 +0100 hr r265821 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (x86)
2008-12-18 16:16:11 +0100 hr r265701 : #i97331#: revert to revision r265576
2008-12-18 16:00:41 +0100 hr r265699 : #i97331#: fix typo in last change
2008-12-17 18:16:18 +0100 hr r265653 : #i97331#: add comment
2008-12-17 18:11:11 +0100 hr r265652 : #i97331#: make -xc99=all again dependend on SYSBASEROOT being set
2008-12-17 01:54:23 +0100 hr r265576 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (Sparc)
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/makefile.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk index 3c8813775d66..ba00e028b9ff 100644 --- a/slideshow/source/engine/makefile.mk +++ b/slideshow/source/engine/makefile.mk @@ -43,6 +43,14 @@ ENABLE_EXCEPTIONS=TRUE # --- Common ---------------------------------------------------------- +.IF "$(OS)"=="SOLARIS" +.IF "$(CCNUMVER)"=="00050009" +# SunStudio12: anachronism warning in boost code (smilfunctionparser.cxx) +# reevaluate with newer boost or compiler version +CFLAGSWARNCXX!:=$(CFLAGSWARNCXX),badargtype2w +.ENDIF +.ENDIF + # Disable optimization for SunCC Sparc (funny loops # when parsing e.g. "x+width/2") # Do not disable optimization for SunCC++ 5.5 Solaris x86, |