Mercurial > mxe-octave
view src/libodbc++-1-libtool.patch @ 4222:44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
* src/qt5.mk: new file
* src/qtbase-1-fixes.patch: new file
* src/qtbase.mk: new file
* src/qtimageformats-1.patch: new file
* src/qtimageformats.mk: new file
* src/qtsvg.mk: new file
* src/qttools-1.patch: new file
* added src/qttools.mk: new file
* changed Makefile.in: added ENABLE_QT5 option
* configure.ac: added enable-qt5 option
* index.html: added new files to packages
* installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.bat: added setup of qt5 bin path
* src/default-octave.mk: added settig fot qt5 usage
* src/qscintilla.mk: added qt5 path
| author | John D |
|---|---|
| date | Thu, 29 Sep 2016 11:22:51 -0400 |
| parents | 6e44b2527dbb |
| children |
line wrap: on
line source
diff -uNr a/configure.ac b/configure.ac --- a/configure.ac 2009-08-20 17:39:08.000000000 -0400 +++ b/configure.ac 2012-12-18 17:19:30.901179636 -0500 @@ -53,10 +53,11 @@ AC_PROG_CXX AC_PROG_CXXCPP AC_LANG_C -AM_PROG_LIBTOOL AC_C_LONG_LONG AC_LANG_CPLUSPLUS +LT_INIT([win32-dll]) + AC_PROG_INSTALL if test "x$GXX" = "xyes" diff -uNr a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am 2005-08-25 09:52:07.000000000 -0400 +++ b/src/Makefile.am 2012-12-18 17:48:24.265430637 -0500 @@ -37,7 +37,7 @@ datahandler.h \ driverinfo.h -ldflags=-version-info @lib_version@ +ldflags=-no-undefined -version-info @lib_version@ # confusing conditionals follow @@ -77,6 +77,7 @@ libodbc___la_SOURCES=$(sources) libodbc___la_LDFLAGS=$(ldflags) +libodbc___la_LIBADD=-lodbc32 libodbc___qt_la_SOURCES=$(sources) libodbc___qt_la_LDFLAGS=$(ldflags)