[Libreoffice-commits] .: 2 commits - RepositoryFixes.mk solenv/gbuild

[Tor Lillqvist]

 RepositoryFixes.mk                 |    6 +-----
 solenv/gbuild/platform/winmingw.mk |    1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 0775fc0c39e7a5dc5f87b31a2ee978050bce299b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 15 16:08:50 2011 +0300

    Bin OLDNAMESLIB which duplicates the existing gb_Library_win32_OLDNAMES

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 7fce10d..ee89377 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -45,8 +45,6 @@ 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))
@@ -79,8 +77,6 @@ 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))
@@ -111,7 +107,7 @@ gb_Library_NOILIBFILENAMES:=\
     msvcrt \
     msvcprt \
     mpr \
-    $(OLDNAMESLIB) \
+    $(gb_Library_win32_OLDNAMES) \
     ole32 \
     oleaut32 \
     shell32 \
commit 5fada178193c8ecd8065ce905a7de698404f9093
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 15 16:07:29 2011 +0300

    Why would we want to define GLIBC when not using glibc?

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index c72bb03..47a47f8 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -83,7 +83,6 @@ endif
 
 gb_COMPILERDEFS := \
 	-DGCC \
-	-DGLIBC=2 \
 	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 	-DCPPU_ENV=gcc3 \
 	-D_MT \