diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
| commit | cd3f2c082b80cdef94388beb71661f39178f799f (patch) | |
| tree | b112df2acc9c55b700494912a3cd69726c62265c /testshl2 | |
| parent | 22a2764205b416bc352fde732da3f1789e7ccab1 (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 'testshl2')
| -rw-r--r-- | testshl2/source/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/testshl2/source/makefile.mk b/testshl2/source/makefile.mk index 3bc9a4f819ba..7f8ac20fc5df 100644 --- a/testshl2/source/makefile.mk +++ b/testshl2/source/makefile.mk @@ -74,7 +74,7 @@ APP1STDLIBS=$(SALLIB) # $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \ # $(SOLARLIBDIR)$/c5t_testresult.lib -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(COM)" == "GCC" APP1STDLIBS+= \ $(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \ @@ -88,6 +88,12 @@ APP1LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib .ENDIF .ENDIF +.IF "$(GUI)" == "OS2" +APP1LIBS= \ + $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \ + $(SOLARLIBDIR)$/c5t_testresult.lib +.ENDIF + .IF "$(GUI)" == "UNX" APP1STDLIBS+= \ $(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \ @@ -113,7 +119,7 @@ APP3STDLIBS=$(SALLIB) APP3DEPN= APP3LIBS= -.IF "$(GUI)"=="WNT" +.IF "$(GUI)" == "WNT" .IF "$(COM)" == "GCC" APP3STDLIBS+= \ $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a |