summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-12-09 08:43:20 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-12-09 08:43:20 +0000
commite20c0f51985c23beb5fbb6f35c92fcb79aee8b70 (patch)
tree9b1f006f669dc536a5b21cb2a6159c373425bf6a /cppu
parent09e59fe62a6f61f461aa26cda4af020a883ec095 (diff)
CWS-TOOLING: integrate CWS os2port04
2008-11-27 13:22:38 +0100 ydario r264480 : #i96439#: fix build for unix platforms. 2008-11-26 18:32:42 +0100 ydario r264433 : #i96439#: os2 systemshell code (dummy code). 2008-11-26 16:33:48 +0100 ydario r264421 : #i96439#: vcl fix for pdf export of truetype fonts. 2008-11-26 15:04:44 +0100 ydario r264399 : #i96439#: build macros fix scripts, gcc specific flags. 2008-11-26 15:00:15 +0100 ydario r264398 : #i96439#: vcl source code updates. 2008-11-26 13:21:37 +0100 ydario r264378 : #i96439#: os2 build system fixes. 2008-11-26 13:20:27 +0100 ydario r264377 : #i96439#: configuration and build macros updates. 2008-11-26 13:16:35 +0100 ydario r264375 : #i96439#: new launcher code, build system updates. 2008-11-26 13:12:49 +0100 ydario r264373 : #i96439#: use OSL endian macro. 2008-11-26 12:54:50 +0100 ydario r264371 : #i96439#: os2 build system fixes. 2008-11-26 12:30:46 +0100 ydario r264367 : #i96439#: os2 build system fixes. 2008-11-26 12:09:33 +0100 ydario r264365 : #i96439#: _Export is a reserved keyword under gcc for os2. 2008-11-26 12:08:12 +0100 ydario r264364 : #i96439#: new libpath handling. 2008-11-26 11:57:51 +0100 ydario r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.
Diffstat (limited to 'cppu')
-rw-r--r--cppu/prj/d.lst3
-rw-r--r--cppu/source/helper/purpenv/export.mk2
2 files changed, 2 insertions, 3 deletions
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index d84af457b..f019d78ad 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -58,8 +58,7 @@ mkdir: %_DEST%\inc%_EXT%\uno
..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib%_EXT%\*
-..\%__SRC%\bin\purpenvh*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\upeh*.dll %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\*
..\%__SRC%\lib\libuno_purpenvhelper* %_DEST%\lib%_EXT%\*
..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin%_EXT%\*
diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk
index cd2f57eca..7e5e9d04d 100644
--- a/cppu/source/helper/purpenv/export.mk
+++ b/cppu/source/helper/purpenv/export.mk
@@ -5,7 +5,7 @@ NAMEpurpenv_helper := uno_purpenvhelper$(COMID)
purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
.ELIF "$(GUI)"=="OS2"
-NAMEpurpenv_helper := upeh$(UDK_MAJOR)
+NAMEpurpenv_helper := purpeh$(UDK_MAJOR)
purpenv_helper_LIB := i$(NAMEpurpenv_helper)
.ELSE