diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-02-20 08:04:14 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-02-20 08:04:14 +0000 |
| commit | 315f1d04ff910a787daaf751bc923223edfac678 (patch) | |
| tree | 9706a1305e88da42193f39052105514d45178b46 /vcl/util | |
| parent | 8efb77720749cdea833e4fb46b153d6f06cf1e9c (diff) | |
INTEGRATION: CWS vcl17 (1.49.2); FILE MERGED
2004/02/12 14:40:32 pl 1.49.2.9: missing link dependency
2004/01/22 14:00:44 pl 1.49.2.8: link dependency
2004/01/21 20:11:24 pl 1.49.2.7: RESYNC: (1.49-1.50); FILE MERGED
2004/01/12 12:57:16 pl 1.49.2.6: fixed Michael's link issue
2003/12/12 14:58:13 pl 1.49.2.5: add gtkwin dir
2003/12/10 12:24:02 pl 1.49.2.4: switch to unified plugin naming scheme
2003/12/04 14:49:32 pl 1.49.2.3: #i22713# first steps for a gtk plugin
2003/11/28 13:43:18 pl 1.49.2.2: #i22981# new dummy plugin for build tools
2003/11/27 13:30:22 pl 1.49.2.1: fixed xinerama linkage
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 159a192326ea..f9c61902abf0 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.51 $ +# $Revision: 1.52 $ # -# last change: $Author: hr $ $Date: 2004-02-04 14:46:09 $ +# last change: $Author: obo $ $Date: 2004-02-20 09:04:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -257,9 +257,7 @@ SHL1STDLIBS += -framework Cocoa .ENDIF -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS += -lXinerama -.ENDIF +SHL1STDLIBS += -lX11 .ENDIF # "$(GUI)"=="UNX" @@ -272,11 +270,11 @@ LIB2FILES= \ $(SLB)$/salwin.lib \ $(SLB)$/salgdi.lib \ $(SLB)$/salapp.lib -SHL2TARGET=pure_x_$(UPD)$(DLLPOSTFIX) +SHL2TARGET=vclplug_gen$(UPD)$(DLLPOSTFIX) SHL2IMPLIB=ipure_x SHL2LIBS= $(LIB2TARGET) -# libs for pure_x plugin +# libs for generic plugin SHL2STDLIBS=\ $(VCLLIB)\ -lpsp$(VERSION)$(DLLPOSTFIX)\ @@ -316,6 +314,40 @@ SHL2STDLIBS += -lXext -lSM -lICE -lX11 .ENDIF # "$(GUIBASE)"=="unx" +# dummy plugin +LIB3TARGET=$(SLB)$/idummy_plug_ +LIB3FILES= \ + $(SLB)$/dapp.lib +SHL3TARGET=vclplug_dummy$(UPD)$(DLLPOSTFIX) +SHL3IMPLIB=idummy_plug_ +SHL3LIBS= $(LIB3TARGET) + +# libs for dummy plugin +SHL3STDLIBS=\ + $(VCLLIB)\ + $(SOTLIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(VOSLIB) \ + $(SALLIB) + +# gtk plugin +LIB4TARGET=$(SLB)$/igtk_plug_ +LIB4FILES=\ + $(SLB)$/gtkapp.lib\ + $(SLB)$/gtkwin.lib +SHL4TARGET=vclplug_gtk$(UPD)$(DLLPOSTFIX) +SHL4IMPLIB=igtk_plug_ +SHL4LIBS=$(LIB4TARGET) +# libs for gtk plugin +SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` +SHL4STDLIBS+=-l$(SHL2TARGET) +SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl + .ENDIF # UNX # --- Allgemein ---------------------------------------------------------- |