summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-09-13 16:07:43 +0000
committerOliver Bolte <obo@openoffice.org>2004-09-13 16:07:43 +0000
commit71ec08ff876519ff490ba8a3fb74c49a01b6fdba (patch)
treeeedede1f1ea691df3984db73d61e2a83638d4e91
parent1ab9e94a2d3686fab3a540ce6b458209adc08bfa (diff)
#i10000# undo change from CWS gtkfpicker1, not buildable
-rw-r--r--fpicker/prj/build.lst3
-rw-r--r--fpicker/util/makefile.mk70
2 files changed, 35 insertions, 38 deletions
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 8c2cf4cdaace..2ec6195c238d 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,6 +1,5 @@
fp fpicker : rdbmaker svtools NULL
-fp fpicker\source\unx\gnome nmake - u fp_gnome_filepicker NULL
fp fpicker\source\win32\filepicker nmake - w fp_win32_filepicker NULL
fp fpicker\source\win32\folderpicker nmake - w fp_win32_folderpicker NULL
fp fpicker\source\win32\misc nmake - w fp_win32_misc fp_win32_filepicker.w fp_win32_folderpicker.w NULL
-fp fpicker\util nmake - all fp_util fp_gnome_filepicker.u fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
+fp fpicker\util nmake - w fp_util fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index b5ff2aa34be6..b1ca2c6d286b 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: hr $ $Date: 2004-09-08 17:11:08 $
+# last change: $Author: obo $ $Date: 2004-09-13 17:07:43 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -75,17 +75,15 @@ USE_LDUMP2=TRUE
# --- fps dynlib ----------------------------------------------
-.IF "$(GUI)"=="WNT" || "$(GUIBASE)" == "unx"
+.IF "$(GUI)"=="WNT"
+
+SHL1TARGET=$(TARGET1)
-COMMON_LIBS=$(CPPULIB)\
+SHL1STDLIBS=$(CPPULIB)\
$(CPPUHELPERLIB)\
$(SALLIB)\
$(VCLLIB)\
- $(TOOLSLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1TARGET=$(TARGET1)
-SHL1STDLIBS= $(COMMON_LIBS) \
+ $(TOOLSLIB)\
uwinapi.lib \
advapi32.lib \
shell32.lib\
@@ -96,53 +94,53 @@ SHL1STDLIBS= $(COMMON_LIBS) \
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
-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)
+
+SHL1RES=$(RES)$/$(TARGET1).res
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
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=$(SHL1IMPLIB)
-SHL2LIBS=$(SHL1LIBS)
+SHL2IMPLIB=i$(SHL2TARGET)
+
+SHL2LIBS=\
+ $(SLB)$/fop.lib\
+ $(SLB)$/utils.lib
+
SHL2OBJS=$(SLOFILES)
SHL2DEF=$(MISC)$/$(SHL2TARGET).def
DEF2NAME=$(SHL2TARGET)
DEF2EXPORTFILE= exports.dxp
-# "$(GUI)"=="WNT" || "$(GUIBASE)"=="unx"
-.ELSE
-dummy:
- @echo "Nothing to build for OS $(OS)"
+
+# "$(GUI)"=="WNT"
.ENDIF