diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:06:07 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:06:07 +0100 |
| commit | 61a4bf5a07bf53d2311d1c773e3087d89fc5be5e (patch) | |
| tree | 5374cbf15147e76f8b0f375701b45b41ba6321b1 /solenv/inc/libs.mk | |
| parent | e175056684aed02597ab8117b22e89ef0c3a5173 (diff) | |
| parent | 064a0b4957300d464384468e172fff6dc01d3875 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
set_soenv.in
Diffstat (limited to 'solenv/inc/libs.mk')
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 538ff55d59b0..14678b7e671c 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -66,7 +66,7 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) -COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID) +COMPHELPERLIB=-lcomphelp$(COMID) CONNECTIVITYLIB=-lconnectivity LDAPBERLIB=-lldapber TOOLSLIBST=-latools @@ -183,9 +183,7 @@ SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail DOCMGRLIB=-ldmg$(DLLPOSTFIX) BASICLIB=-lsb$(DLLPOSTFIX) -.IF "$(ENABLE_VBA)"=="YES" VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX) -.ENDIF DBTOOLSLIB=-ldbtools$(DLLPOSTFIX) HM2LIBSH=-lhmwrpdll HM2LIBST=-lhmwrap @@ -355,6 +353,7 @@ LPSOLVELIB=-llpsolve55 SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp TESTLIB=-ltest +XMLREADERLIB=-lxmlreader .ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -531,5 +530,6 @@ SOFFICELIB=isofficeapp.lib UNOPKGAPPLIB=iunopkgapp.lib TESTLIB=itest.lib BOOSTTHREADLIB=boostthread.lib +XMLREADERLIB=ixmlreader.lib .ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" |