diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-28 10:29:52 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-28 10:29:52 +0000 |
| commit | 561486d0a3a64a47a750b24c3d43e2dd3c389fc0 (patch) | |
| tree | 361188fbcbd315b238e819b8053b857aea99123b /odk/source | |
| parent | c1e0e8df764f4b62458a1401b6497fdde10ba4fb (diff) | |
INTEGRATION: CWS unowinregcross2_SRC680 (1.5.8); FILE MERGED
2006/08/21 11:02:14 rene 1.5.8.2: thinko
2006/08/21 10:35:19 rene 1.5.8.1: #i68813# fix build with sun/blackdown Java
Diffstat (limited to 'odk/source')
| -rw-r--r-- | odk/source/unowinreg/win/makefile.mk | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index 9d48f96e3837..400356da985d 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.5 $ +# $Revision: 1.6 $ # -# last change: $Author: ihi $ $Date: 2006-08-03 15:12:11 $ +# last change: $Author: ihi $ $Date: 2006-08-28 11:29:52 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -47,6 +47,23 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk +JAVA_INCLUDES:= -I$(JAVA_HOME)/include + +# values taken from set_soenv.in +.IF "$(JDK)" != "gcj" +.IF "$(OS)" == "LINUX" +JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux +.ELIF "$(OS)" == "FREEBSD" +JAVA_INCLUDES+= -I$(JAVA_HOME)/include/freebsd +JAVA_INCLUDES+= -I$(JAVA_HOME)/include/bsd +JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux +.ELIF "$(OS)" == "NETBSD" +JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd +.ELIF "$(OS)" == "IRIX" +JAVA_INCLUDES+= -I$(JAVA_HOME)/include/solaris +.ENDIF +.ENDIF + .IF "$(SOLAR_JAVA)"=="" nojava: @echo "Not building javaunohelper because Java is disabled" @@ -57,7 +74,7 @@ nojava: .IF "$(BUILD_UNOWINREG)" == "YES" $(BIN)$/unowinreg.dll : unowinreg.cxx - $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ -I$(JAVA_HOME)/include \ + $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) \ -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \ -Wl,--kill-at -lkernel32 -ladvapi32 $(MINGWSTRIP) $(BIN)$/unowinreg.dll |