diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 14:05:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 18:01:27 +0000 |
| commit | 8646ab97dc37c0606b19057686bf3d610f9c15ee (patch) | |
| tree | 17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /dbaccess | |
| parent | 09e9274fc080b471393b806617eb03124db67590 (diff) | |
Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW. Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux. That attempt can be considered abandoned, and
the relevant code rotting.
Due to this heritage, there are now three kinds of MinGW-specific code in LO:
* Code from the original OOo native Windows effort that is no longer relevant
for the LO cross-compilation effort, but has never been removed properly.
* Code from the original OOo native Windows effort that is re-purposed for the
LO cross-compilation effort.
* Code that has been added specifially for the LO cross-compilation effort.
All three kinds of code are removed.
(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)
Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/Library_dbu.mk | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/adodatalinks.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 6aa3f150a6b0..b29a3d41b114 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -29,12 +29,6 @@ $(eval $(call gb_Library_add_defs,dbu,\ -DDBACCESS_DLLIMPLEMENTATION \ )) -ifeq ($(OS)$(COM),WNTGCC) # for adoint.h -$(eval $(call gb_Library_add_cxxflags,dbu,\ - -fpermissive \ -)) -endif - $(eval $(call gb_Library_use_externals,dbu,\ boost_headers \ odbc_headers \ diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index b945c434d2aa..0c926f2be990 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -37,12 +37,6 @@ #include "adodatalinks.hxx" -#ifdef __MINGW32__ -const IID IID_IDataSourceLocator = { 0x2206CCB2, 0x19C1, 0x11D1, { 0x89, 0xE0, 0x00, 0xC0, 0x4F, 0xD7, 0xA8, 0x29 } }; -const CLSID CLSID_DataLinks = { 0x2206CDB2, 0x19C1, 0x11D1, { 0x89, 0xE0, 0x00, 0xC0, 0x4F, 0xD7, 0xA8, 0x29 } }; -#endif - - OLECHAR const * PromptEdit(long hWnd,OLECHAR const * connstr); BSTR PromptNew(long hWnd); diff --git a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx index 4805d16053c6..58e779907ea8 100644 --- a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx +++ b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx @@ -111,11 +111,7 @@ HWND initInstance( HINSTANCE _hAppInstance ) } // main window function -#ifdef __MINGW32__ -extern "C" int APIENTRY WinMain( HINSTANCE _hAppInstance, HINSTANCE, LPSTR, int ) -#else extern "C" int APIENTRY _tWinMain( HINSTANCE _hAppInstance, HINSTANCE, LPTSTR, int ) -#endif { if ( !registerWindowClass( _hAppInstance ) ) return FALSE; |