diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-25 15:09:17 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-25 15:09:28 +0100 |
| commit | 25b7b727475f057b5c8f9b4f69b21f3d922a2302 (patch) | |
| tree | 3886406d765dd192e9686661651dd222bfda8cbe | |
| parent | 2b7ba2d3c35eef5517ef4c119143451fbf903b7f (diff) | |
Don't use "uno_" prefix for libraries on Windows
| -rw-r--r-- | sal/textenc/makefile.mk | 2 | ||||
| -rw-r--r-- | sal/util/makefile.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sal/textenc/makefile.mk b/sal/textenc/makefile.mk index e6834b0cc769..f029a852e5aa 100644 --- a/sal/textenc/makefile.mk +++ b/sal/textenc/makefile.mk @@ -107,7 +107,7 @@ OBJTARGET=$(LB)$/$(TARGET).lib # be nicer to avoid DLLPRE .IF "$(GUI)" == "WNT" -CDEFS+=-DPLUGIN_NAME=$(DLLPRE)uno_sal_textenc$(UDK_MAJOR)$(DLLPOST) +CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(UDK_MAJOR)$(DLLPOST) .ELSE CDEFS+=-DPLUGIN_NAME=$(DLLPRE)uno_sal_textenc$(DLLPOST).$(UDK_MAJOR) .ENDIF diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index f0076ea514df..85307d23ee8f 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -166,7 +166,11 @@ SHL1STDLIBS+=-lgcc SHL4DEPN+=$(SHL1TARGETN) SHL4LIBS=$(SLB)$/textenc_tables.lib +.IF "$(GUI)" == "WNT" +SHL4TARGET=sal_textenc +.ELSE SHL4TARGET=uno_sal_textenc +.ENDIF SHL4STDLIBS=$(SALLIB) SHL4VERSIONMAP=saltextenc.map |