Tag: cws_src680_mingwport03 User: vg Date: 2006/09/07 03:36:17 Modified: dba/dbaccess/source/ui/dlg/makefile.mk dba/dbaccess/source/ui/misc/HtmlReader.cxx dba/dbaccess/util/makefile.mk
Log: #i53572# MinGW port 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.33&r2=1.33.50.1 Delta lines: +7 -3 ------------------- --- makefile.mk 20 Jun 2006 03:08:38 -0000 1.33 +++ makefile.mk 7 Sep 2006 10:36:14 -0000 1.33.50.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.33.50.1 $ # -# last change: $Author: hr $ $Date: 2006/06/20 03:08:38 $ +# last change: $Author: vg $ $Date: 2006/09/07 10:36:14 $ # # 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.25&r2=1.25.50.1 Delta lines: +7 -3 ------------------- --- HtmlReader.cxx 20 Jun 2006 03:20:01 -0000 1.25 +++ HtmlReader.cxx 7 Sep 2006 10:36:14 -0000 1.25.50.1 @@ -4,9 +4,9 @@ * * $RCSfile: HtmlReader.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.50.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:20:01 $ + * last change: $Author: vg $ $Date: 2006/09/07 10:36:14 $ * * 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.27&r2=1.27.38.1 Delta lines: +6 -6 ------------------- --- makefile.mk 10 Jul 2006 15:47:24 -0000 1.27 +++ makefile.mk 7 Sep 2006 10:36:14 -0000 1.27.38.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.27.38.1 $ # -# last change: $Author: obo $ $Date: 2006/07/10 15:47:24 $ +# last change: $Author: vg $ $Date: 2006/09/07 10:36:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -154,9 +154,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]
