4 files changed, 23 insertions, 13 deletions
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 87ff914710e8..0ee434b54239 100644
--- a/cppu/prj/d.lst
+++ b/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\*
diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk
index 004787e4f45c..6ffea2e6a576 100644
--- a/cppu/source/helper/purpenv/export.mk
+++ b/cppu/source/helper/purpenv/export.mk
@@ -1,15 +1,8 @@
 
-.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
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
index 8c6d6944e0ad..f3cb0c631d90 100644
--- a/cppu/util/extra.mk
+++ b/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
 
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 0c09a1bda400..ea0c09488c85 100644
--- a/cppu/util/makefile.mk
+++ b/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    := \