diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 15:01:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 15:01:11 +0000 |
| commit | 07c9a5b49d3c841ff3bc5e4b2d528dae0bb1b17a (patch) | |
| tree | 1aab702fd2b3cb3090285a2834b3968be7ab829f /vcl/util | |
| parent | dc9a08649aec6cd902eeba4fca1e03238447b327 (diff) | |
INTEGRATION: CWS nwf (1.52.2); FILE MERGED
2004/04/02 13:01:25 ssa 1.52.2.3: RESYNC: (1.52-1.53); FILE MERGED
2004/03/16 16:31:19 pl 1.52.2.2: #i26570# honor ENABLE_GTK flag
2004/02/27 08:31:38 ssa 1.52.2.1: #i25130# initial native widget framework, merged from srx645
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 32f349aa0b32..40fd95650223 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.53 $ +# $Revision: 1.54 $ # -# last change: $Author: hr $ $Date: 2004-03-09 12:16:00 $ +# last change: $Author: hr $ $Date: 2004-05-10 16:01:11 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -341,9 +341,11 @@ SHL3STDLIBS=\ $(SALLIB) # gtk plugin +.IF "$(ENABLE_GTK)" != "" LIB4TARGET=$(SLB)$/igtk_plug_ LIB4FILES=\ $(SLB)$/gtkapp.lib\ + $(SLB)$/gtkgdi.lib\ $(SLB)$/gtkwin.lib SHL4TARGET=vclplug_gtk$(UPD)$(DLLPOSTFIX) SHL4IMPLIB=igtk_plug_ @@ -352,6 +354,7 @@ SHL4LIBS=$(LIB4TARGET) SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` SHL4STDLIBS+=-l$(SHL2TARGET) SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl +.ENDIF # "$(ENABLE_GTK)" != "" .ENDIF # UNX |