diff options
| -rwxr-xr-x | scp2/inc/macros.inc | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 8 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 14 |
3 files changed, 16 insertions, 9 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 0ceb5119afa5..690a21d97765 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -515,16 +515,15 @@ End #define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll" #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll" #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll" +#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure #if defined _MSC_VER -#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #if defined _DEBUG_RUNTIME #define SCP2_STDLP_DEBUG "d" #else #define SCP2_STDLP_DEBUG "" #endif #else // GCC -#define SCP2_URE_DL_UNO_COMID_VER(n, v) n STRING(COMID) ".dll" #define SCP2_STDLP_DEBUG "" #endif #else diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index e1401db59d29..43d0d28deb7c 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -225,7 +225,7 @@ gb_Library_UDK_MAJORVER := 3 gb_Library_PLAINEXT := .dll.a gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) -gb_Library_RTVEREXT := $(gb_Library_RTEXT) +gb_Library_RTVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT) @@ -233,7 +233,7 @@ gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT) gb_Library_DLLEXT := .dll gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT) -gb_Library_RTVERDLLEXT := $(gb_Library_RTDLLEXT) +gb_Library_RTVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTDLLEXT) 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) @@ -292,7 +292,7 @@ gb_Library_FILENAMES :=\ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -304,7 +304,7 @@ gb_Library_DLLFILENAMES :=\ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \ $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \ - $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \ + $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \ $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \ 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 |