[Libreoffice-commits] .: external/jawt external/prj

[Tor Lillqvist]

 external/jawt/makefile.mk |   42 ++++++++++++++++++++++++++++++++++++++++++
 external/prj/build.lst    |    1 +
 external/prj/d.lst        |    2 ++
 3 files changed, 45 insertions(+)

New commits:
commit ad981ac2d39b677183dbc5c9a0d73bf86bbd833e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jun 29 12:24:04 2011 +0300

    Produce an import library for jawt.dll when cross-compiling to Windows
    
    There is just one export from jawt.dll, so just build an import
    library trivially ourselves instead of requiring copying the jawt.lib
    from a Windows JDK installation.

diff --git a/external/jawt/makefile.mk b/external/jawt/makefile.mk
new file mode 100644
index 0000000..469621d
--- /dev/null
+++ b/external/jawt/makefile.mk
@@ -0,0 +1,42 @@
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is Novell, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+PRJ=..
+PRJNAME=external
+TARGET=libjawt
+
+.INCLUDE :  settings.mk
+
+.IF "$(OS)$(COM)" != "WNTGCC" ||  "$(CROSS_COMPILING)" != "YES"
+
+ALL:
+    @echo Nothing needed for this configuration
+
+.ENDIF
+
+all: $(LB)/libjawt.dll.a
+
+$(LB)/libjawt.dll.a:
+    (echo EXPORTS; echo JAWT_GetAWT at 8) >$(MISC)/jawt.def
+    $(DLLTOOL) --input-def=$(MISC)/jawt.def --output-lib=$@ --dllname=jawt.dll
+
+.INCLUDE :  target.mk
diff --git a/external/prj/build.lst b/external/prj/build.lst
index 8bcc6c1..6a66269 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -3,3 +3,4 @@ el	external					usr1 - all el_mkout NULL
 el	external\glibc		nmake	-	all	el_glibc NULL
 el	external\gcc3_specific	nmake	-	all	el_gcc3 NULL
 el	external\mingwheaders		nmake	-	w	el_mingwheaders NULL
+el	external\jawt		nmake	-	w	el_jawt NULL
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 55e10bc..b779c12 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -53,5 +53,7 @@ mkdir: %_DEST%\inc\external\mingw\include\sys
 
 ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
 
+..\%__SRC%\lib\libjawt.dll.a %_DEST%\lib\libjawt.dll.a
+
 linklib: libgcc_s.*.*