diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 16:11:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 16:11:08 +0000 |
| commit | d46d4eaeb6704ba1785de87c1912806f8ba0f07e (patch) | |
| tree | 07116c1cf1cf60dff650600278675c1ac2e4e30d /fpicker/util | |
| parent | e851c0cdf1a86bc555cf9432a66a33fbd1210471 (diff) | |
INTEGRATION: CWS gtkfpicker1 (1.3.92); FILE MERGED
2004/08/04 15:03:09 cmc 1.3.92.1: #i32555# optional gnome filepicker
Diffstat (limited to 'fpicker/util')
| -rw-r--r-- | fpicker/util/makefile.mk | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk index 6a8d4846a84e..b5ff2aa34be6 100644 --- a/fpicker/util/makefile.mk +++ b/fpicker/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hro $ $Date: 2002-08-26 14:03:30 $ +# last change: $Author: hr $ $Date: 2004-09-08 17:11:08 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -75,15 +75,17 @@ USE_LDUMP2=TRUE # --- fps dynlib ---------------------------------------------- -.IF "$(GUI)"=="WNT" - -SHL1TARGET=$(TARGET1) +.IF "$(GUI)"=="WNT" || "$(GUIBASE)" == "unx" -SHL1STDLIBS=$(CPPULIB)\ +COMMON_LIBS=$(CPPULIB)\ $(CPPUHELPERLIB)\ $(SALLIB)\ $(VCLLIB)\ - $(TOOLSLIB)\ + $(TOOLSLIB) + +.IF "$(GUI)"=="WNT" +SHL1TARGET=$(TARGET1) +SHL1STDLIBS= $(COMMON_LIBS) \ uwinapi.lib \ advapi32.lib \ shell32.lib\ @@ -94,53 +96,53 @@ SHL1STDLIBS=$(CPPULIB)\ kernel32.lib\ comsupp.lib\ oleaut32.lib +SHL2STDLIBS= $(COMMON_LIBS) \ + uwinapi.lib \ + advapi32.lib \ + ole32.lib\ + gdi32.lib\ + shell32.lib\ + comsupp.lib\ + oleaut32.lib -SHL1DEPN= SHL1IMPLIB=i$(SHL1TARGET) - SHL1LIBS=$(SLB)$/fps.lib\ $(SLB)$/utils.lib - -SHL1OBJS=$(SLOFILES) - SHL1RES=$(RES)$/$(TARGET1).res SHL1DEF=$(MISC)$/$(SHL1TARGET).def - DEF1NAME=$(SHL1TARGET) +.ELSE +.IF "$(ENABLE_GTK)" == "TRUE" +SHL1TARGET=fps_gnome +SHL1LIBS=$(SLB)$/fps_gnome.lib +SHL1STDLIBS= $(COMMON_LIBS) `pkg-config --libs gtk+-2.0` +SHL2STDLIBS= $(SHL1STDLIBS) +DEF1NAME=$(SHL1TARGET) +.ENDIF +.ENDIF + +SHL1DEPN= +SHL1OBJS=$(SLOFILES) + DEF1EXPORTFILE= exports.dxp # --- fop dynlib -------------------------------------------------- SHL2TARGET=$(TARGET2) -SHL2STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB)\ - $(TOOLSLIB)\ - $(VCLLIB)\ - uwinapi.lib \ - advapi32.lib \ - ole32.lib\ - gdi32.lib\ - shell32.lib\ - comsupp.lib\ - oleaut32.lib - SHL2DEPN= -SHL2IMPLIB=i$(SHL2TARGET) - -SHL2LIBS=\ - $(SLB)$/fop.lib\ - $(SLB)$/utils.lib - +SHL2IMPLIB=$(SHL1IMPLIB) +SHL2LIBS=$(SHL1LIBS) SHL2OBJS=$(SLOFILES) SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) DEF2EXPORTFILE= exports.dxp - -# "$(GUI)"=="WNT" +# "$(GUI)"=="WNT" || "$(GUIBASE)"=="unx" +.ELSE +dummy: + @echo "Nothing to build for OS $(OS)" .ENDIF |