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 /cppuhelper | |
| parent | c908467f098bf1e8be7c5d7fddaf66c5506675af (diff) | |
Tweak some DLL and import library names in the WNTGCC case
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/prj/d.lst | 2 | ||||
| -rwxr-xr-x | cppuhelper/source/makefile.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst index c26529d071e8..a27212ce02bb 100644 --- a/cppuhelper/prj/d.lst +++ b/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\* diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index f3123541fd93..aed6ae6b56cd 100755 --- a/cppuhelper/source/makefile.mk +++ b/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) |