diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:39:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:39:30 +0000 |
| commit | 4fd50f1553125778f645181761182467a632571c (patch) | |
| tree | fd420694c1e6e7635c51d5ed4215c40a2427dc97 /fpicker | |
| parent | f16daff033a4ebe5e9acddcc532fd16af85671c3 (diff) | |
INTEGRATION: CWS aquafilepicker02_DEV300 (1.2.40); FILE MERGED
2008/02/14 17:28:45 fheckl 1.2.40.4: Further changes concerning Autoextension
2008/01/14 08:23:24 fheckl 1.2.40.3: Code cleanup and some implementation details
2008/01/02 18:25:59 fheckl 1.2.40.2: issue #80399 more Cocoa
2007/11/18 19:36:37 fheckl 1.2.40.1: initial support for Cocoa version
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/makefile.mk | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk index d7259bc14837..6d1710ed9b3c 100644 --- a/fpicker/source/aqua/makefile.mk +++ b/fpicker/source/aqua/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: ihi $ $Date: 2007-07-11 11:00:44 $ +# last change: $Author: kz $ $Date: 2008-03-05 16:39:30 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,8 +44,8 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk -#CFLAGS += -Wall DLLPRE= # ------------------------------------------------------------------ @@ -61,14 +61,17 @@ dummy: # --- Files -------------------------------------------------------- SLOFILES =\ - $(SLO)$/resourceprovider.obj \ - $(SLO)$/FPentry.obj \ - $(SLO)$/SalAquaPicker.obj \ - $(SLO)$/SalAquaFilePicker.obj \ - $(SLO)$/SalAquaFolderPicker.obj \ - $(SLO)$/CFStringUtilities.obj \ - $(SLO)$/FilterHelper.obj \ - $(SLO)$/ControlHelper.obj + $(SLO)$/resourceprovider.obj \ + $(SLO)$/FPentry.obj \ + $(SLO)$/SalAquaPicker.obj \ + $(SLO)$/SalAquaFilePicker.obj \ + $(SLO)$/SalAquaFolderPicker.obj \ + $(SLO)$/CFStringUtilities.obj \ + $(SLO)$/FilterHelper.obj \ + $(SLO)$/ControlHelper.obj \ + $(SLO)$/NSString_OOoAdditions.obj \ + $(SLO)$/NSURL_OOoAdditions.obj \ + $(SLO)$/AquaFilePickerDelegate.obj SHL1NOCHECK=TRUE SHL1TARGET= $(TARGET) @@ -81,6 +84,7 @@ SHL1STDLIBS=\ $(SALLIB) SHL1VERSIONMAP=exports.map +SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) .ENDIF # "$(GUIBASE)" != "aqua" |