To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=53572
------- Additional comments from [EMAIL PROTECTED] Wed Sep 13 06:23:36 -0700
2006 -------
@vg: Please find diff of solenv/inc/libs.mk,
shell/source/win32/shlxthandler/makefile.mk,
shell/source/win32/shlxthandler/ooofilt/makefile.mk
For libs.mk, the diff is from rev m180 now.
The last two are substitutes to those I proposed Sep. 8. The old ones were
incomplete and broke MSVC build.
tono (Takashi Ono)
--- ooo_src680_m180/solenv/inc/libs.mk.orig 2006-07-19 18:38:31.000000000
+0900
+++ ooo_src680_m180/solenv/inc/libs.mk 2006-09-02 08:08:36.171875000 +0900
@@ -38,7 +38,7 @@
LIBPRE=libr
.ENDIF
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(COM)"=="GCC"
#
#externe libs in plattform.mk
@@ -54,7 +54,11 @@
.IF "$(WITH_GPC)"!="NO"
GPC3RDLIB=-lgpc
.ENDIF
+.IF "$(GUI)$(COM)"=="WNTGCC"
+SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
+.ELSE
SALHELPERLIB=-luno_salhelper$(COMID)
+.ENDIF
XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX)
.INCLUDE .IGNORE : comphelper$/version.mk
COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)
@@ -70,22 +74,40 @@
OSLLIB=
RTLLIB=
TECLIB=
+.IF "$(GUI)$(COM)"=="WNTGCC"
+CPPULIB=-lcppu$(UDK_MAJOR)
+CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
+.ELSE
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+.ENDIF
.INCLUDE .IGNORE : ucbhelper$/version.mk
UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+.IF "$(GUI)$(COM)"=="WNTGCC"
+REGLIB=-lreg$(UDK_MAJOR)
+.ELSE
REGLIB=-lreg
+.ENDIF
.INCLUDE .IGNORE : vos$/version.mk
VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
XMLOFFLIB=-lxo$(OFFICEUPD)$(DLLPOSTFIX)
XMLOFFLLIB=-lxol
+.IF "$(GUI)$(COM)"=="WNTGCC"
+STORELIB=-lstore$(UDK_MAJOR)
+SALLIB=-lsal$(UDK_MAJOR)
+.ELSE
STORELIB=-lstore
SALLIB=-luno_sal
+.ENDIF
.INCLUDE .IGNORE : connectivity$/version.mk
ODBCLIB=-lodbc$(ODBC_MAJOR)
ODBCBASELIB=-lodbcbase$(ODBC_MAJOR)
DBFILELIB=-lfile$(OFFICEUPD)$(DLLPOSTFIX)
+.IF "$(GUI)$(COM)"=="WNTGCC"
+RMCXTLIB=-lrmcxt$(UDK_MAJOR)
+.ELSE
RMCXTLIB=-lrmcxt
+.ENDIF
BTSTRPLIB=-lbtstrp
BTSTRPDTLIB=-lbootstrpdt
TRANSEXLIB=-ltransex
@@ -101,11 +123,15 @@
ONELIB=-lone$(OFFICEUPD)$(DLLPOSTFIX)
MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC)
MOZBASELIB=-lnspr4 -lxpcom
+.IF "$(GUI)$(COM)"=="WNTGCC"
+LDAPSDKLIB=-lnsldap32v50
+.ELSE
.IF "$(WITH_OPENLDAP)" == "YES"
LDAPSDKLIB=-lldap
.ELSE
LDAPSDKLIB=-lldap50
.ENDIF
+.ENDIF
ONELIB=
UNOLIB=
SVLIB=-lvcl$(OFFICEUPD)$(DLLPOSTFIX)
@@ -130,13 +156,26 @@
XPLIB=-l_xp
TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
+.IF "$(GUI)$(COM)"=="WNTGCC"
+XMLSECLIB=-lxmlsec1-1
+XMLSECLIB-NSS=-lxmlsec1-nss-1
+.ELSE
XMLSECLIB=-lxmlsec1
XMLSECLIB-NSS=-lxmlsec1-nss
+.ENDIF
+.IF "$(GUI)$(COM)"=="WNTGCC"
+LIBXML2LIB=-lxml2-2
+.ELSE
LIBXML2LIB=-lxml2
+.ENDIF
NSS3LIB=-lnss3
NSPR4LIB=-lnspr4
PLC4LIB=-lplc4
NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB)
$(NSPR4LIB) $(PLC4LIB)
+.IF "$(GUI)$(COM)"=="WNTGCC"
+XMLSECLIB-MS=-lxmlsec1-mscrypto-1
+MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) $(CRYPT32LIB)
$(ADVAPI32LIB)
+.ENDIF
BROOKERLIB=-lbrooker$(OFFICEUPD)$(DLLPOSTFIX)
SIMPLECMLIB=-lsimplecm$(OFFICEUPD)$(DLLPOSTFIX)
COMMUNILIB=-lcommuni$(OFFICEUPD)$(DLLPOSTFIX)
@@ -145,7 +184,11 @@
SVLLIB=-lsvl$(OFFICEUPD)$(DLLPOSTFIX)
SVMEMLIB=
SVUNZIPLIB=-lsvunzip
+.IF "$(GUI)$(COM)"=="WNTGCC"
+SVUNZIPDLL=-lunzipdll
+.ELSE
SVUNZIPDLL=-lzip$(OFFICEUPD)$(DLLPOSTFIX)
+.ENDIF
PLUGCTORLIB=-lplugctor
# PLUGCTORLIB=
SO2LIB=-lso$(OFFICEUPD)$(DLLPOSTFIX)
@@ -191,6 +234,11 @@
JPEG3RDLIB=-ljpeglib
.ENDIF
NEON3RDLIB=-lneon
+.IF "$(GUI)$(COM)"=="WNTGCC"
+BERKELEYLIB=-ldb42
+BERKELEYCPPLIB=-ldb_cxx42
+CURLLIB=-lcurl-3
+.ELSE
.IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-ldb
BERKELEYCPPLIB=-ldb_cxx
@@ -199,6 +247,7 @@
BERKELEYCPPLIB=-ldb_cxx-4.2
.ENDIF
CURLLIB=-lcurl
+.ENDIF
SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
SFXDEBUGLIB=
@@ -236,14 +285,26 @@
PKGCHKLIB=-lpkgchk$(OFFICEUPD)$(DLLPOSTFIX)
SYSSHELLLIB=-lsysshell
SSOOPTLIB=-lssoopt$(OFFICEUPD)$(DLLPOSTFIX)
+.IF "$(GUI)$(COM)"=="WNTGCC"
+JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
+.ELSE
JVMACCESSLIB = -ljvmaccess$(COMID)
+.ENDIF
CPPUNITLIB = -lcppunit$(DLLPOSTFIX)
+.IF "$(GUI)$(COM)"=="WNTGCC"
+XML2LIB=-lxml2-2
+.ELSE
.IF "$(SYSTEM_LIBXML)"=="YES"
XML2LIB=$(LIBXML_LIBS)
.ELSE
XML2LIB=-lxml2
.ENDIF
+.ENDIF
+.IF "$(GUI)$(COM)"=="WNTGCC"
+JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
+.ELSE
JVMFWKLIB = -ljvmfwk
+.ENDIF
# #110743#
# For BinFilters, some libs were added.
@@ -280,6 +341,18 @@
USED_RCLIENT_LIBS = $(VCLLIB) $(SOTLIB) $(TOOLSLIB) $(UNOLIB) \
$(USED_UNO_LIBS)
+SABLOT3RDLIB=-lsablot
+APP3RDLIB=-lapp
+SAMPLE3RDLIB=-lsample
+HNJLIB=-lhnj
+MYSPELLLIB=-lmyspell
+COSVLIB=-lcosv
+UDMLIB=-ludm
+HUNSPELLLIB=-lhunspell
+ULINGULIB=-lulingu
+MYTHESLIB=-lmythes
+PYUNOLIB=-lpyuno
+
.ELSE # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
AWTLIB*=jawt.lib
AVMEDIALIB=$(LIBPRE) iavmedia.lib
@@ -447,5 +520,17 @@
BFXMLOFFLIB=$(LIBPRE) ibf_xo.lib
LEGACYSMGRLIB=$(LIBPRE) ilegacy_binfilters.lib
+SABLOT3RDLIB= $(LIBPRE) sablot.lib
+APP3RDLIB= $(LIBPRE) app.lib
+SAMPLE3RDLIB= $(LIBPRE) sample.lib
+HNJLIB= libhnj.lib
+MYSPELLLIB= $(LIBPRE) myspell.lib
+COSVLIB= $(LIBPRE) cosv.lib
+UDMLIB= $(LIBPRE) udm.lib
+HUNSPELLLIB=hunspell.lib
+ULINGULIB=$(LIBPRE) libulingu.lib
+MYTHESLIB=libmythes.lib
+PYUNOLIB=ipyuno.lib
+
.ENDIF # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
--- ooo_src680_m180/shell/source/win32/shlxthandler/makefile.mk.orig 2005-
09-08 04:58:57.000000000 +0900
+++ ooo_src680_m180/shell/source/win32/shlxthandler/makefile.mk 2006-09-11
19:45:10.765625000 +0900
@@ -61,20 +61,27 @@
SHL1TARGET=$(TARGET)
-SHL1STDLIBS=uwinapi.lib\
- oleaut32.lib\
- advapi32.lib\
- ole32.lib\
- uuid.lib\
- shell32.lib\
- kernel32.lib\
- gdi32.lib\
- gdiplus.lib
-
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB)
+SHL1LIBS=
+.ELSE
+SHL1STDLIBS=
SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
$(SOLARLIBDIR)$/expat_xmlparse.lib\
- $(SOLARLIBDIR)$/expat_xmltok.lib\
- $(SLB)$/util.lib\
+ $(SOLARLIBDIR)$/expat_xmltok.lib
+.ENDIF
+SHL1STDLIBS+=$(UWINAPILIB)\
+ $(OLEAUT32LIB)\
+ $(ADVAPI32LIB)\
+ $(OLE32LIB)\
+ $(UUIDLIB)\
+ $(SHELL32LIB)\
+ $(KERNEL32LIB)\
+ $(GDI32LIB)\
+ $(COMCTL32LIB)\
+ $(GDIPLUSLIB)
+
+SHL1LIBS+=$(SLB)$/util.lib\
$(SLB)$/ooofilereader.lib
SHL1DEPN=
---------------------------------------------------------------------
Please do not reply to this automatically generated notification from
Issue Tracker. Please log onto the website and enter your comments.
http://qa.openoffice.org/issue_handling/project_issues.html#notification
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
