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 /salhelper | |
| parent | c908467f098bf1e8be7c5d7fddaf66c5506675af (diff) | |
Tweak some DLL and import library names in the WNTGCC case
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/prj/d.lst | 3 | ||||
| -rw-r--r-- | salhelper/source/makefile.mk | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst index 6f5df50693c1..2aa89bba83f0 100644 --- a/salhelper/prj/d.lst +++ b/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\* diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index 8c7d8a2c0963..9d7abaf97b69 100644 --- a/salhelper/source/makefile.mk +++ b/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) |