diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 14:12:11 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 14:12:11 +0000 |
| commit | 0c7a5d64aacfcf563c6e22c14ed6541aef3a0536 (patch) | |
| tree | ff5f18fb9efaa8bba197715bcf9555661c5636fd /odk/source | |
| parent | c89a59ed6955bc107157f116d68dda34565288e8 (diff) | |
INTEGRATION: CWS unowinregcross (1.4.56); FILE MERGED
2006/07/16 15:46:24 rene 1.4.56.1: #i49718# make unowinreg.dll rebuildable
Diffstat (limited to 'odk/source')
| -rw-r--r-- | odk/source/unowinreg/win/makefile.mk | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index 71989870700a..9d48f96e3837 100644 --- a/odk/source/unowinreg/win/makefile.mk +++ b/odk/source/unowinreg/win/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-09-07 20:20:44 $ +# last change: $Author: ihi $ $Date: 2006-08-03 15:12:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,6 +52,27 @@ nojava: @echo "Not building javaunohelper because Java is disabled" .ENDIF +.IF "$(OS)" != "WNT" + +.IF "$(BUILD_UNOWINREG)" == "YES" + +$(BIN)$/unowinreg.dll : unowinreg.cxx + $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ -I$(JAVA_HOME)/include \ + -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \ + -Wl,--kill-at -lkernel32 -ladvapi32 + $(MINGWSTRIP) $(BIN)$/unowinreg.dll + +.ELSE + +$(BIN)$/unowinreg.dll : $(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)$/unowinreg.dll + +-rm -f $@ >& $(NULLDEV) + $(GNUCOPY) $< $@ + +.ENDIF + +.ELSE # "$(OS)" != "WNT" +# Always build unowinreg.dll on windows + # --- Files -------------------------------------------------------- SLOFILES = \ @@ -74,6 +95,8 @@ DEF1DES=unowinreg NO_SHL1DESCRIPTION=TRUE +.ENDIF # "$(OS)" != "WNT" + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |