diff options
| author | Yuri Dario <ydario@apache.org> | 2012-02-18 18:28:22 +0000 |
|---|---|---|
| committer | Yuri Dario <ydario@apache.org> | 2012-02-18 18:28:22 +0000 |
| commit | ee9bc4299ca0899b7f0e9a65fd73689fe18fa16d (patch) | |
| tree | b5edf00d5531abffd3877fda72ba05cbc4f530bd /cppu | |
| parent | 02e75d8f74aba5e174c3ad0840443c8de146936a (diff) | |
i118923 - OS/2 port: new link system now uses unix style.
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/prj/d.lst | 1 | ||||
| -rw-r--r-- | cppu/source/helper/purpenv/export.mk | 2 | ||||
| -rw-r--r-- | cppu/util/makefile.mk | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst index 411a51cf2518..6775c0353218 100644 --- a/cppu/prj/d.lst +++ b/cppu/prj/d.lst @@ -54,6 +54,7 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\inc\cppu\helper\purpenv\Mapping.hxx %_DEST%\inc%_EXT%\cppu\helper\purpenv\Mapping.hxx ..\%__SRC%\lib\icppu.lib %_DEST%\lib%_EXT%\icppu.lib +..\%__SRC%\lib\cppu*.lib %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\* diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk index 7e5e9d04d1d2..455a274a2561 100644 --- a/cppu/source/helper/purpenv/export.mk +++ b/cppu/source/helper/purpenv/export.mk @@ -6,7 +6,7 @@ purpenv_helper_LIB := -l$(NAMEpurpenv_helper) .ELIF "$(GUI)"=="OS2" NAMEpurpenv_helper := purpeh$(UDK_MAJOR) -purpenv_helper_LIB := i$(NAMEpurpenv_helper) +purpenv_helper_LIB := -l$(NAMEpurpenv_helper) .ELSE NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID) diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 9344143ee6c7..eac3d26e7580 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -28,7 +28,7 @@ USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE -.IF "$(OS)" != "WNT" +.IF "$(OS)" != "WNT" && "$(OS)" != "OS2" UNIXVERSIONNAMES=UDK .ENDIF |