From 8646ab97dc37c0606b19057686bf3d610f9c15ee Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 Feb 2017 14:05:21 +0100 Subject: 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 Reviewed-by: Stephan Bergmann --- desktop/win32/source/applauncher/launcher.cxx | 4 ---- desktop/win32/source/guiloader/genericloader.cxx | 10 ---------- desktop/win32/source/guistdio/guistdio.inc | 9 --------- desktop/win32/source/officeloader/officeloader.cxx | 4 ---- desktop/win32/source/unoinfo.cxx | 9 --------- 5 files changed, 36 deletions(-) (limited to 'desktop') diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx index 029d1a17b28c..beb05f56d90a 100644 --- a/desktop/win32/source/applauncher/launcher.cxx +++ b/desktop/win32/source/applauncher/launcher.cxx @@ -24,11 +24,7 @@ #include #include -#ifdef __MINGW32__ -extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) -#else extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) -#endif { // Retrieve startup info diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx index 5398610d396e..cdad10687b0e 100644 --- a/desktop/win32/source/guiloader/genericloader.cxx +++ b/desktop/win32/source/guiloader/genericloader.cxx @@ -141,22 +141,12 @@ static int GenericMain() return dwExitCode; } - -#ifdef __MINGW32__ -int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) -#else int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) -#endif { return GenericMain(); } - -#ifdef __MINGW32__ -int __cdecl main() -#else int __cdecl _tmain() -#endif { return GenericMain(); } diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index d688db35f395..5617d889a402 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -274,16 +274,7 @@ BOOL WINAPI CtrlBreakHandler( return TRUE; } - - - - - -#ifdef __MINGW32__ -int main( int, char ** ) -#else int _tmain( int, _TCHAR ** ) -#endif { TCHAR szTargetFileName[MAX_PATH] = TEXT(""); STARTUPINFO aStartupInfo; diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index e841e8769328..935cc7e42bb8 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -56,11 +56,7 @@ static LPTSTR *GetCommandArgs( int *pArgc ) #endif } -#ifdef __MINGW32__ -int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) -#else int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) -#endif { TCHAR szTargetFileName[MAX_PATH] = TEXT(""); TCHAR szIniDirectory[MAX_PATH]; diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx index 4f8bbcc40be3..3ee7e7750335 100644 --- a/desktop/win32/source/unoinfo.cxx +++ b/desktop/win32/source/unoinfo.cxx @@ -70,21 +70,12 @@ void writePath( } -#ifdef __MINGW32__ -int main(int argc, char ** argv, char **) { - if (argc == 2 && strcmp(argv[1], "c++") == 0) { -#else int wmain(int argc, wchar_t ** argv, wchar_t **) { if (argc == 2 && wcscmp(argv[1], L"c++") == 0) { -#endif wchar_t path[MAX_PATH]; wchar_t * pathEnd = getBrandPath(path); writePath(path, pathEnd, MY_STRING(L"")); -#ifdef __MINGW32__ - } else if (argc == 2 && strcmp(argv[1], "java") == 0) { -#else } else if (argc == 2 && wcscmp(argv[1], L"java") == 0) { -#endif if (fwrite("1", 1, 1, stdout) != 1) { exit(EXIT_FAILURE); } -- cgit