Tag: cws_src680_mingwport2 User: vg Date: 2006/07/12 03:39:15 Modified: dba/dbaccess/source/ui/dlg/makefile.mk dba/dbaccess/source/ui/misc/HtmlReader.cxx dba/dbaccess/util/makefile.mk
Log: #i53572# MinGW port efforts File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/makefile.mk?r1=1.31&r2=1.31.20.1 Delta lines: +7 -3 ------------------- --- makefile.mk 29 Mar 2006 12:38:38 -0000 1.31 +++ makefile.mk 12 Jul 2006 10:39:11 -0000 1.31.20.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.31 $ +# $Revision: 1.31.20.1 $ # -# last change: $Author: obo $ $Date: 2006/03/29 12:38:38 $ +# last change: $Author: vg $ $Date: 2006/07/12 10:39:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,6 +44,10 @@ .IF "$(SYSTEM_ODBC_HEADERS)" == "YES" CFLAGS+=-DSYSTEM_ODBC_HEADERS +.ENDIF + +.IF "$(GUI)$(COM)"=="WNTGCC" # for adoint.h +CFLAGS+=-fpermissive .ENDIF # --- Files ------------------------------------- Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: HtmlReader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/HtmlReader.cxx?r1=1.24&r2=1.24.4.1 Delta lines: +7 -3 ------------------- --- HtmlReader.cxx 4 May 2006 08:44:26 -0000 1.24 +++ HtmlReader.cxx 12 Jul 2006 10:39:12 -0000 1.24.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: HtmlReader.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.4.1 $ * - * last change: $Author: rt $ $Date: 2006/05/04 08:44:26 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:39:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -160,7 +160,11 @@ const HTMLOptionEnum* getOptions() { +#ifdef __MINGW32__ // for runtime pseudo reloc + static HTMLOptionEnum aHTMLMetaNameTable[] = +#else static HTMLOptionEnum __READONLY_DATA aHTMLMetaNameTable[] = +#endif { { sHTML_META_author, HTML_META_AUTHOR }, { sHTML_META_changed, HTML_META_CHANGED }, Directory: /dba/dbaccess/util/ ============================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/util/makefile.mk?r1=1.26&r2=1.26.58.1 Delta lines: +6 -6 ------------------- --- makefile.mk 7 Apr 2006 14:13:59 -0000 1.26 +++ makefile.mk 12 Jul 2006 10:39:12 -0000 1.26.58.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.26 $ +# $Revision: 1.26.58.1 $ # -# last change: $Author: vg $ $Date: 2006/04/07 14:13:59 $ +# last change: $Author: vg $ $Date: 2006/07/12 10:39:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -153,9 +153,9 @@ .IF "$(GUI)"=="WNT" #needed by $(SLO)$/adodatalinks.obj -SHL2STDLIBS+= ole32.lib \ - oleaut32.lib \ - uuid.lib +SHL2STDLIBS+= $(OLE32LIB) \ + $(OLEAUT32LIB) \ + $(UUIDLIB) .ENDIF RESLIB2NAME=$(TARGET2) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
