diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-22 10:15:34 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-02-22 11:01:32 +0100 |
| commit | 2dea294025d3468ca4afffe04ce697dcfe72de36 (patch) | |
| tree | a638176e90929fbca94eb64ff751d4c872928151 /solenv/inc | |
| parent | 0e981390fb8000c0a5d2bb98917f4ffff6ad636a (diff) | |
put version number in all versioned URE libs' names on MinGW
It does not make sense to do it for some of them, but not all. It is
also inconsistent with other platforms.
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/libs.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 12db54a70e17..4ef070759c8b 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -34,6 +34,14 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$" .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") +# workaround for MinGW to get the same DLL names as with MSC +# e.g., uno_salhelper3gcc3.dll (vs. uno_salhelpergcc3.dll) +.IF "$(GUI)" == "WNT" +COMID_WITH_VERSION = $(UDK_MAJOR)$(COMID) +.ELSE +COMID_WITH_VERSION = $(COMID) +.ENDIF + .IF "$(GUI)" == "WNT" ODMA_LIB_LIB=-lodma_lib .ENDIF @@ -63,7 +71,7 @@ I18NUTILLIB=-li18nutil$(COMID) I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX) -SALHELPERLIB=-luno_salhelper$(COMID) +SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION) XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) COMPHELPERLIB=-lcomphelp$(COMID) CONNECTIVITYLIB=-lconnectivity @@ -72,7 +80,7 @@ TOOLSLIBST=-latools BPICONVLIB=-lbpiconv TOOLSLIB=-ltl$(DLLPOSTFIX) CPPULIB=-luno_cppu -CPPUHELPERLIB=-luno_cppuhelper$(COMID) +CPPUHELPERLIB=-luno_cppuhelper$(COMID_WITH_VERSION) UCBHELPERLIB=-lucbhelper4$(COMID) .IF "$(SYSTEM_OPENSSL)" == "YES" OPENSSLLIB=$(OPENSSL_LIBS) @@ -236,7 +244,7 @@ ISCLIB=-lsc$(DLLPOSTFIX) ISDLIB=-lsd$(DLLPOSTFIX) PKGCHKLIB=-lpkgchk$(DLLPOSTFIX) HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX) -JVMACCESSLIB = -ljvmaccess$(COMID) +JVMACCESSLIB = -ljvmaccess$(COMID_WITH_VERSION) .IF "$(SYSTEM_CPPUNIT)"=="YES" CPPUNITLIB = $(CPPUNIT_LIBS) .ELSE |