diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 08:13:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 08:13:35 +0000 |
| commit | dfb297c24b385ce9705fe1b53ccec576e9655a9d (patch) | |
| tree | 754a5a3f9f4b0eb5899b7db28ca6badd369b6a0a /dtrans | |
| parent | 1c392a2aa94a7973b1cdcede9c419eadf1b1d681 (diff) | |
INTEGRATION: CWS aquavcl01 (1.9.4); FILE MERGED
2007/06/28 14:09:19 tra 1.9.4.7: #i77593#support for copy&paste of pictures, OLE data exchanges with MS Office etc.
2007/06/14 12:06:18 tra 1.9.4.6: Work in progress, checked in to have it saved in the repos.
2007/05/24 19:53:30 tra 1.9.4.5: Implementing paste system -> OOo
2006/08/07 18:28:22 ebischoff 1.9.4.4: After review by hjs
Hrmpf... We're almost back to my original patch ;-)
2006/08/05 11:21:40 ebischoff 1.9.4.3: After discussion with Pavel and a look at issue #67333
2006/08/05 10:11:42 ebischoff 1.9.4.2: OOps, typo.
2006/08/05 09:55:39 ebischoff 1.9.4.1: Solution for second part of issue #i36841:
"the component dtransaqua.rdb fails to register"
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/aqua/makefile.mk | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/dtrans/source/aqua/makefile.mk b/dtrans/source/aqua/makefile.mk index 54a4b910091c..6ea1f1c168a5 100644 --- a/dtrans/source/aqua/makefile.mk +++ b/dtrans/source/aqua/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: obo $ $Date: 2007-01-25 15:41:57 $ +# last change: $Author: rt $ $Date: 2007-07-05 09:13:35 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,6 +52,8 @@ USE_BOUNDCHK= # ------------------------------------------------------------------ +CFLAGS+=-fconstant-cfstrings + .IF "$(OS)"!="MACOSX" dummy: @@ -66,7 +68,11 @@ dummy: SLOFILES= \ $(SLO)$/aqua_service.obj \ - $(SLO)$/aqua_clipboard.obj + $(SLO)$/aqua_clipboard.obj \ + $(SLO)$/DataFlavorMapping.obj \ + $(SLO)$/OSXTransferable.obj \ + $(SLO)$/HtmlFmtFlt.obj \ + $(SLO)$/PictToBmpFlt.obj SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) @@ -74,7 +80,8 @@ SHL1STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ - -framework Cocoa + -framework Carbon \ + -framework QuickTime SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) @@ -89,13 +96,11 @@ APP1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ -framework Cocoa - + # --- Targets ------------------------------------------------------ ALL : ALLTAR -# hjs - do *not* call deliver out of makefiles -# deliver.pl - regcomp -register -r $(BIN)$/$(COMP1TYPELIST).rdb -c $(SHL1TARGET) + +cd $(LB) && regcomp -register -r ../bin/$(COMP1TYPELIST).rdb -c $(SHL1TARGET) .INCLUDE : target.mk |