[Libreoffice-commits] .: 2 commits - cppunit/prj mythes/makefile.mk

[Tor Lillqvist]

 cppunit/prj/d.lst  |    2 +-
 mythes/makefile.mk |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d6fd5fef4055c99b296d2daf39bdf8ea044a23f4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 23:29:39 2011 +0300

    Pass --build and --host options also when cross-compiling to Windows

diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index abd7038..b0054c9 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -98,6 +98,10 @@ CONFIGURE_FLAGS= --disable-shared --with-pic \
     HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \
     HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.2"
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+.ENDIF
+
 BUILD_ACTION=make
 
 .ELSE
commit 6e01b00b151c79e4999b967404346c7cab33c819
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 14:04:01 2011 +0300

    Surely we are not building Cygwin DLLs in the WNTGCC case!?

diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index a2efb6b..1cfdb55 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -16,7 +16,7 @@ mkdir: %_DEST%\inc\cppunit\ui\text
 ..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin\cppunit_dll.dll
 ..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib\icppunit_dll.lib
 
-..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin\cygcppunit-1-12-1.dll
+..\%__SRC%\bin\libcppunit-1-12-1.dll %_DEST%\bin\libcppunit-1-12-1.dll
 ..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib\libcppunit.dll.a
 
 ..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit-1.12.1.dylib