diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:27:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:27:42 +0000 |
| commit | ee75491a53cce0dffe72e8bdcfdcfd7ae378135f (patch) | |
| tree | 62dd50eb319b65bc3382b8ee5b64e1d19d91fbf8 | |
| parent | e45475a487f7622b3fb08dee021333db27cd211c (diff) | |
INTEGRATION: CWS sj12 (1.3.18); FILE MERGED
2004/11/23 19:05:28 sj 1.3.18.2: #i36002# no optimize for CustomShapeParser under solaris
2004/11/01 17:23:04 sj 1.3.18.1: #i36003,i36002# file format changes
| -rw-r--r-- | svx/source/customshapes/makefile.mk | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk index b3ed40de9f28..2ea8e2a48681 100644 --- a/svx/source/customshapes/makefile.mk +++ b/svx/source/customshapes/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2004-10-12 14:12:47 $ +# last change: $Author: rt $ $Date: 2004-11-26 14:27:42 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,6 +71,12 @@ ENABLE_EXCEPTIONS=TRUE # --- Types ------------------------------------- +# Disable optimization for SunCC (funny loops +# when parsing e.g. "x+width/2") +.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" +NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj +.ENDIF + UNOTYPES= com.sun.star.uno.XWeak \ com.sun.star.uno.XNamingService \ com.sun.star.uno.XComponentContext \ @@ -93,13 +99,14 @@ UNOTYPES= com.sun.star.uno.XWeak \ # --- Files ------------------------------------- -SLOFILES= $(SLO)$/EnhancedCustomShapeEngine.obj \ - $(SLO)$/EnhancedCustomShapeTypeNames.obj\ - $(SLO)$/EnhancedCustomShapeGeometry.obj \ - $(SLO)$/EnhancedCustomShape2d.obj \ - $(SLO)$/EnhancedCustomShape3d.obj \ - $(SLO)$/EnhancedCustomShapeFontWork.obj \ - $(SLO)$/EnhancedCustomShapeHandle.obj \ +SLOFILES= $(SLO)$/EnhancedCustomShapeEngine.obj \ + $(SLO)$/EnhancedCustomShapeTypeNames.obj \ + $(SLO)$/EnhancedCustomShapeGeometry.obj \ + $(SLO)$/EnhancedCustomShape2d.obj \ + $(SLO)$/EnhancedCustomShape3d.obj \ + $(SLO)$/EnhancedCustomShapeFontWork.obj \ + $(SLO)$/EnhancedCustomShapeHandle.obj \ + $(SLO)$/EnhancedCustomShapeFunctionParser.obj \ $(SLO)$/tbxcustomshapes.obj # --- Targets ---------------------------------- |