[Libreoffice-commits] .: Branch 'integration/dev300_m101' - RepositoryFixes.mk solenv/gbuild

Tor Lillqvist tml at kemper.freedesktop.org
Wed Mar 16 03:57:44 PDT 2011


 RepositoryFixes.mk                 |    1 +
 solenv/gbuild/platform/windows.mk  |    2 ++
 solenv/gbuild/platform/winmingw.mk |    4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 62d089daba8263316971d037394210bb57b7c3f9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 12:54:52 2011 +0200

    Add msvcprt, too, wherever msvcrt is mentioned

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 91e1fcd..b685703 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -125,6 +125,7 @@ gb_Library_NOILIBFILENAMES:=\
     icuuc \
     kernel32 \
     msvcrt \
+    msvcprt \
     mpr \
     oldnames \
     ole32 \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index a16ec55..cad5be5 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -164,6 +164,7 @@ gb_STDLIBS := \
 	uwinapi \
 	kernel32 \
 	msvcrt \
+	msvcprt \
 	oldnames \
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
@@ -438,6 +439,7 @@ gb_Library_PLAINLIBS_NONE += \
 	gnu_getopt \
 	kernel32 \
 	msvcrt \
+	msvcprt \
 	mpr \
 	oldnames \
 	ole32 \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 918283a..d9e5ed8 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -140,7 +140,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-DEXCEPTIONS_OFF \
 	-fno-exceptions \
-	
+
 gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
@@ -175,6 +175,7 @@ gb_STDLIBS := \
 	mingwex \
 	kernel32 \
 	msvcrt \
+	msvcprt \
 
 
 # Helper class
@@ -452,6 +453,7 @@ gb_Library_PLAINLIBS_NONE += \
 	gdi32 \
 	kernel32 \
 	msvcrt \
+	msvcprt \
 	mpr \
 	moldname \
 	ole32 \


More information about the Libreoffice-commits mailing list