[Libreoffice-commits] .: 2 commits - solenv/gbuild solenv/inc

[Tor Lillqvist]

 solenv/gbuild/platform/windows.mk  |    4 +++-
 solenv/gbuild/platform/winmingw.mk |    7 +++++++
 solenv/inc/libs.mk                 |    4 ----
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit d155f52aa4db3674fd0ebfdb1666b47fd824feab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jun 29 15:25:30 2011 +0300

    Add more Win32 API libraries and factor out the moldname/oldnames difference

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index c8e2d47..b7db476 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -386,6 +386,8 @@ gb_Library_get_rpath :=
 gb_Library_SYSPRE := i
 gb_Library_PLAINEXT := .lib
 
+gb_Library_win32_OLDNAMES := oldnames
+
 gb_Library_PLAINLIBS_NONE += \
 	advapi32 \
 	gdi32 \
@@ -397,7 +399,7 @@ gb_Library_PLAINLIBS_NONE += \
 	msvcrt \
 	msvcprt \
 	mpr \
-	oldnames \
+	$(gb_Library_win32_OLDNAMES) \
 	ole32 \
 	oleaut32 \
 	shell32 \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 3be32bc..1ac6ff1 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -491,6 +491,8 @@ gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
 gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT)
 gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT)
 
+gb_Library_win32_OLDNAMES := moldname
+
 gb_Library_PLAINLIBS_NONE += \
 	mingwthrd \
 	mingw32 \
@@ -500,10 +502,13 @@ gb_Library_PLAINLIBS_NONE += \
 	advapi32 \
 	gdi32 \
 	gnu_getopt \
+	imm32 \
 	kernel32 \
+	msimg32 \
 	msvcrt \
 	msvcprt \
 	mpr \
+	$(gb_Library_win32_OLDNAMES) \
 	ole32 \
 	oleaut32 \
 	shell32 \
@@ -512,6 +517,8 @@ gb_Library_PLAINLIBS_NONE += \
 	user32 \
 	uuid \
 	uwinapi \
+	version \
+	winspool \
 	z \
 
 gb_Library_LAYER := \
commit a9cb8452f8dc031f83dbca32ba3b2082b1f325c2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jun 29 15:22:14 2011 +0300

    Just use the same style library name for jvmaccess for MinGW as for Unix

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 1592f93..d9db573 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -229,11 +229,7 @@ ISCLIB=-lsc$(DLLPOSTFIX)
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(COMID)
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 .IF "$(SYSTEM_CPPUNIT)"=="YES"
 CPPUNITLIB = $(CPPUNIT_LIBS)
 .ELSE