[Libreoffice-commits] .: 3 commits - configure.in RepositoryFixes.mk solenv/gbuild

[Tor Lillqvist]

 RepositoryFixes.mk                 |    6 +++++-
 configure.in                       |    1 +
 solenv/gbuild/platform/winmingw.mk |    1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 192a78878aedf4099856b6265907f8538aa7cf8c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 15:55:32 2011 +0300

    Factor out the oldnames/moldname difference between WNTMSC and WNTGCC

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index f1f7b41..f056b8d 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -45,6 +45,8 @@ endif
 ifeq ($(OS),WNT)
 
 ifeq ($(COM),GCC)
+OLDNAMESLIB := moldname
+
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
@@ -76,6 +78,8 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 
 else
+OLDNAMESLIB := oldnames
+
 gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
@@ -106,7 +110,7 @@ gb_Library_NOILIBFILENAMES:=\
     msvcrt \
     msvcprt \
     mpr \
-    oldnames \
+    $(OLDNAMESLIB) \
     ole32 \
     oleaut32 \
     shell32 \
commit b010a3d9a58f20290f0931223b47f87f7823f869
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 15:54:29 2011 +0300

    Add the gdiplus library

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 1ac6ff1..5d3879e 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -501,6 +501,7 @@ gb_Library_PLAINLIBS_NONE += \
 	$(gb_MINGW_LIBGCC) \
 	advapi32 \
 	gdi32 \
+	gdiplus \
 	gnu_getopt \
 	imm32 \
 	kernel32 \
commit ae083ef0f23d1f824998609b5e81d5e96f02560e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 13:32:42 2011 +0300

    Unset the Python environment vars when running the sub-configure

diff --git a/configure.in b/configure.in
index f8e8070..6015b02 100755
--- a/configure.in
+++ b/configure.in
@@ -1697,6 +1697,7 @@ if test "$cross_compiling" = "yes"; then
     (
     unset COM GUI GUIBASE OS CPU CPUNAME
     unset CC CXX SYSBASE CFLAGS
+    unset PYTHON_CFLAGS PYTHON_LIBS
     unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
     test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
     test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"