Tweak some DLL and import library names in the WNTGCC case

cppu/prj/d.lst

@@ -55,11 +55,13 @@ mkdir: %_DEST%\inc\uno
 
 ..\%__SRC%\lib\icppu.lib %_DEST%\lib\icppu.lib
 ..\%__SRC%\bin\cppu* %_DEST%\bin\*
+..\%__SRC%\bin\uno_cppu* %_DEST%\bin\*
 ..\%__SRC%\lib\libuno_cppu.* %_DEST%\lib\*
 
 ..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib\*
 ..\%__SRC%\bin\purpe*.dll     %_DEST%\bin\*
-..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib\*
+..\%__SRC%\bin\uno_purpe*.dll     %_DEST%\bin\*
+..\%__SRC%\lib\libuno_purpenvhelper*.* %_DEST%\lib\*
 
 ..\%__SRC%\bin\unsafe_u*.dll    %_DEST%\bin\*
 ..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib\*

cppu/source/helper/purpenv/export.mk

 
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(COM)"=="GCC"
 NAMEpurpenv_helper := uno_purpenvhelper$(COMID)
-
 purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
-
 .ELSE
 NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID)
-.IF "$(COM)"=="GCC"
-purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
-.ELSE
 purpenv_helper_LIB := $(LIBPRE) i$(NAMEpurpenv_helper).lib
 .ENDIF
-
-.ENDIF

cppu/util/extra.mk

@@ -41,7 +41,11 @@ USE_DEFFILE      :=TRUE
 # --- Files --------------------------------------------------------
 
 SHL3TARGET  := unsafe_uno_uno
+.IF "$(COM)" == "MSC"
 SHL3IMPLIB  := i$(SHL3TARGET)
+.ELSE
+SHL3IMPLIB  := $(SHL3TARGET)
+.ENDIF
 SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
 SHL3DEF     := empty.def
@@ -49,19 +53,26 @@ SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
 SHL3RPATH   := URELIB
 
 SHL4TARGET  := affine_uno_uno
+.IF "$(COM)" == "MSC"
 SHL4IMPLIB  := i$(SHL4TARGET)
+.ELSE
+SHL4IMPLIB  := $(SHL4TARGET)
+.ENDIF
 SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
 SHL4DEF     := empty.def
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
 SHL4RPATH   := URELIB
 
-
 SHL5TARGET  := log_uno_uno
+.IF "$(COM)" == "MSC"
 SHL5IMPLIB  := i$(SHL5TARGET)
+.ELSE
+SHL5IMPLIB  := $(SHL5TARGET)
+.ENDIF
 SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB)
 SHL5OBJS    := $(SLO)$/LogBridge.obj
-                
+
 SHL5DEF     := empty.def
 SHL5RPATH   := URELIB
 

cppu/util/makefile.mk

@@ -32,7 +32,7 @@ USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 
-.IF "$(OS)" != "WNT"
+.IF "$(COM)" != "MSC"
 UNIXVERSIONNAMES=UDK
 .ENDIF
 
@@ -50,7 +50,7 @@ SHL1LIBS= \
     $(SLB)$/cppu_threadpool.lib	\
     $(SLB)$/cppu_cppu.lib
 
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
 SHL1TARGET=$(TARGET)$(UDK_MAJOR)
 .ELSE
 SHL1TARGET= uno_$(TARGET)
@@ -84,7 +84,11 @@ SHL2VERSIONMAP:=$(SHL2TARGET)X.map
 SHL2VERSIONMAP:=$(SHL2TARGET).map
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 SHL2DEF     := $(MISC)$/$(SHL2TARGET).def
+.IF "$(COM)" == "MSC"
 SHL2IMPLIB  := i$(SHL2TARGET)
+.ELSE
+SHL2IMPLIB  := $(SHL2TARGET)
+.ENDIF
 SHL2STDLIBS := $(CPPULIB) $(SALLIB)
 SHL2RPATH   := URELIB
 SHL2OBJS    := \

cppuhelper/prj/d.lst

@@ -57,8 +57,8 @@ mkdir: %_DEST%\inc\cppuhelper
 ..\inc\cppuhelper\unourl.hxx %_DEST%\inc\cppuhelper\unourl.hxx
 
 ..\%__SRC%\bin\cppuh*.dll %_DEST%\bin\cppuh*.dll
+..\%__SRC%\bin\uno_cppuh*.dll %_DEST%\bin\uno_cppuh*.dll
 ..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib\*
-
 ..\%__SRC%\lib\libuno_cppuhelper*.* %_DEST%\lib\*
 
 ..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib\*

cppuhelper/source/makefile.mk

@@ -37,9 +37,9 @@ USE_DEFFILE=TRUE
 # without "-L" (light) switch
 BOOTSTRAP_SERVICE=TRUE
 
-.IF "$(OS)" != "WNT"
+.IF "$(COM)" != "MSC"
 UNIXVERSIONNAMES=UDK
-.ENDIF # WNT
+.ENDIF
 
 # --- Settings -----------------------------------------------------
 
@@ -148,7 +148,7 @@ SLOFILES= \
 
 OBJFILES = $(OBJ)$/findsofficepath.obj
 
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
 SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
 .ELSE
 SHL1TARGET=uno_$(TARGET)$(COMID)

salhelper/prj/d.lst

@@ -13,8 +13,9 @@ mkdir: %_DEST%\inc\salhelper
 ..\inc\salhelper\timer.hxx %_DEST%\inc\salhelper\timer.hxx
 
 ..\%__SRC%\bin\salhelp*.dll %_DEST%\bin\salhelp*.dll
-..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\*
+..\%__SRC%\bin\uno_salhelp*.dll %_DEST%\bin\uno_salhelp*.dll
 
+..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\*
 ..\%__SRC%\lib\libuno_salhelper*.* %_DEST%\lib\*
 
 ..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib\*

salhelper/source/makefile.mk

@@ -33,9 +33,9 @@ ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(OS)" != "WNT"
+.IF "$(COM)" != "MSC"
 UNIXVERSIONNAMES=UDK
-.ENDIF # WNT
+.ENDIF
 
 # --- Settings -----------------------------------------------------
 
@@ -54,7 +54,7 @@ SHL1TARGET=	$(TARGET)$(UDK_MAJOR)$(COMID)
 SHL1IMPLIB=	i$(TARGET)
 .ELSE
 SHL1TARGET=	uno_$(TARGET)$(COMID)
-SHL1IMPLIB=	$(SHL1TARGET)
+SHL1IMPLIB=	uno_$(TARGET)$(COMID)
 .ENDIF
 
 SHL1STDLIBS=$(SALLIB)

scp2/inc/macros.inc

@@ -506,6 +506,7 @@ End
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
 #define SCP2_URE_DL_NORMAL(n) n ".dll"
 #define SCP2_URE_DL_BARE(n) n ".dll"
+#if defined _MSC
 #define SCP2_URE_DL_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
@@ -517,6 +518,16 @@ End
 #else
 #define SCP2_STDLP_DEBUG ""
 #endif
+#else // GCC
+#define SCP2_URE_DL_VER(n, v) n v ".dll"
+#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) "uno_" n v ".dll"
+#define SCP2_URE_DL_UNO_COMID_VER(n, v)	\
+    "uno_" n STRING(COMID) v ".dll"
+#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
+#define SCP2_STDLP_DEBUG ""
+#endif
 #else
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
 #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)