diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:58:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 14:58:32 +0000 |
| commit | 7b741be01fa43cd21547f3ff759ef906971588a9 (patch) | |
| tree | b85e2a871ddbcb400ad156ea5acbe121d5458147 /vcl/unx | |
| parent | ad242d05f3060358c4dc294536a89a0084cda4a0 (diff) | |
INTEGRATION: CWS nwf (1.12.2); FILE MERGED
2004/02/27 08:31:36 ssa 1.12.2.1: #i25130# initial native widget framework, merged from srx645
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/gdi/makefile.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk index 78bd5719816f..be0b22a05acf 100644 --- a/vcl/unx/source/gdi/makefile.mk +++ b/vcl/unx/source/gdi/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: obo $ $Date: 2004-02-20 08:59:20 $ +# last change: $Author: hr $ $Date: 2004-05-10 15:58:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,7 +87,6 @@ SLOFILES= \ $(SLO)$/salvd.obj \ $(SLO)$/salogl.obj \ $(SLO)$/dtint.obj \ - $(SLO)$/kdeint.obj \ $(SLO)$/salcvt.obj \ $(SLO)$/xfont.obj \ $(SLO)$/xlfd_attr.obj \ @@ -96,6 +95,15 @@ SLOFILES= \ $(SLO)$/salgdi3.obj \ $(SLO)$/pspgraphics.obj +.IF "$(WITH_WIDGETSET)"=="kde" + # salnativewidgets-kde.cxx contains own implementation of KDEintegrator + SLOFILES+=$(SLO)/salnativewidgets-kde.obj + CFLAGS+=$(WIDGETSET_CFLAGS) +.ELSE + SLOFILES+= \ + $(SLO)$/kdeint.obj +.ENDIF + .IF "$(USE_XPRINT)" == "TRUE" CFLAGS+=-D_USE_PRINT_EXTENSION_=1 SLOFILES+=$(SLO)$/xprintext.obj |