diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 23:42:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-30 11:13:32 +0300 |
| commit | e081225623ee71557d28afe9a1fbeeeb80faa798 (patch) | |
| tree | 297bb7c3f4ca48a5d12bbe5e2fc52acd662861f1 /cppu/util | |
| parent | c908467f098bf1e8be7c5d7fddaf66c5506675af (diff) | |
Tweak some DLL and import library names in the WNTGCC case
Diffstat (limited to 'cppu/util')
| -rw-r--r-- | cppu/util/extra.mk | 15 | ||||
| -rw-r--r-- | cppu/util/makefile.mk | 8 |
2 files changed, 19 insertions, 4 deletions
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 := \ |