diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:49:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:49:20 +0000 |
| commit | e75ddc4836c10756e755b74665297d8612439433 (patch) | |
| tree | 0ae2a910c6dca6fd668faaf5e73a5466292bbf83 /solenv/inc | |
| parent | 6e257fbe9a5527c4bf858c425aec763710fcf33e (diff) | |
INTEGRATION: CWS os2port03 (1.123.44); FILE MERGED
2008/07/16 12:19:38 obr 1.123.44.3: RESYNC: (1.123-1.136); FILE MERGED
2008/04/15 14:37:59 ydario 1.123.44.2: Issue number: i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/29 15:36:12 ydario 1.123.44.1: os2 build system fixes.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/libs.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 215bc665f84c..75ca69f2b84c 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -8,7 +8,7 @@ # # $RCSfile: libs.mk,v $ # -# $Revision: 1.136 $ +# $Revision: 1.137 $ # # This file is part of OpenOffice.org. # @@ -28,9 +28,9 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -LIBSMKREV!:="$$Revision: 1.136 $$" +LIBSMKREV!:="$$Revision: 1.137 $$" -.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC" +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" # #externe libs in plattform.mk @@ -351,7 +351,8 @@ LPSOLVELIB=-llpsolve55 SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp -.ELSE # "$(GUI)"=="UNX" +.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" + AWTLIB*=jawt.lib AVMEDIALIB=iavmedia.lib ICUINLIB=icuin.lib @@ -370,7 +371,11 @@ LDAPBERLIB=ldapber.lib CPPULIB=icppu.lib CPPUHELPERLIB=icppuhelper.lib UCBHELPERLIB=iucbhelper.lib +.IF "$(GUI)"=="OS2" +OPENSSLLIB=ssl.lib crypto.lib +.ELSE OPENSSLLIB=ssleay32.lib libeay32.lib +.ENDIF ODBCLIB=iodbc.lib ODBCBASELIB=iodbcbase.lib DBFILELIB=ifile.lib @@ -516,4 +521,4 @@ LPSOLVELIB=lpsolve55.lib SOFFICELIB=isofficeapp.lib UNOPKGAPPLIB=iunopkgapp.lib -.ENDIF # "$(GUI)"=="UNX" || "$(GUI)"=="MAC" +.ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" |