View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0003782 | Far Manager | _Common | public | 2020-03-22 19:40 | 2020-03-22 23:52 |
| Reporter | romanbtl | Assigned To | DrKnS | ||
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Fixed in Version | 3.0 | ||||
| Summary | 0003782: Minor issues that prevent Far to be compiled with Mingw-w64 on Linux | ||||
| Description | Attached you will find fixes for minor issuses that prevent compilation with Mingw-w64 on Linux. Merging these changes upstream would make it possible to compile Far Manager and plugins on Linux out-of-box. | ||||
| Tags | No tags attached. | ||||
| Build | 5575 | ||||
|
|
0001-Support-building-on-mingw64-headers.patch (1,132 bytes)
From 64133ca589beb9f5a0f955aad6bd50709d58122a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Pi=C5=A1l?= <rpisl@seznam.cz> Date: Fri, 6 Mar 2020 16:52:40 +0100 Subject: [PATCH 1/4] Support building on mingw64 - headers. --- far/headers.hpp | 2 +- far/sdk/sdk_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/far/headers.hpp b/far/headers.hpp index 89b4fa08c..6bc8fe837 100644 --- a/far/headers.hpp +++ b/far/headers.hpp @@ -159,7 +159,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <shlobj.h> #include <shellapi.h> #include <userenv.h> -#include <DbgHelp.h> +#include <dbghelp.h> #include <dwmapi.h> #include <restartmanager.h> #include <commdlg.h> diff --git a/far/sdk/sdk_common.h b/far/sdk/sdk_common.h index 5743e6578..72d8129b2 100644 --- a/far/sdk/sdk_common.h +++ b/far/sdk/sdk_common.h @@ -352,7 +352,7 @@ typedef struct _RTL_RESOURCE RTL_RESOURCE, *PRTL_RESOURCE; #if _WIN32_WINNT >= 0x0603 -#include <VersionHelpers.h> +#include <versionhelpers.h> #else #define _WIN32_WINNT_WIN8 0x0602 #define _WIN32_WINNT_WINBLUE 0x0603 -- 2.20.1 0002-Support-building-on-mingw64-ico.patch (504 bytes)
From 47fde5c30841c7e69b8f5343cd144e37fd2e82be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Pi=C5=A1l?= <rpisl@seznam.cz>
Date: Fri, 6 Mar 2020 16:53:51 +0100
Subject: [PATCH 2/4] Support building on mingw64 - ico.
---
far/{far.hack.ico => Far.hack.ico} | Bin
1 file changed, 0 insertions(+), 0 deletions(-)
rename far/{far.hack.ico => Far.hack.ico} (100%)
diff --git a/far/far.hack.ico b/far/Far.hack.ico
similarity index 100%
rename from far/far.hack.ico
rename to far/Far.hack.ico
--
2.20.1
0003-Support-building-on-mingw64-plugins.patch (3,093 bytes)
From ff1a603d8bf23151a07a6bb38916c6115127c061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Pi=C5=A1l?= <rpisl@seznam.cz>
Date: Sun, 22 Mar 2020 19:55:09 +0100
Subject: [PATCH 3/4] Support building on mingw64 - plugins.
---
plugins/arclite/headers.hpp | 2 +-
plugins/emenu/FarMenu.h | 2 +-
plugins/emenu/Plugin.cpp | 2 +-
plugins/farcmds/makefile_gcc | 2 +-
plugins/luamacro/luafar/win.c | 2 +-
plugins/proclist/Plist.cpp | 2 +-
plugins/proclist/makefile_gcc | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/plugins/arclite/headers.hpp b/plugins/arclite/headers.hpp
index 4a126231a..063cccb65 100644
--- a/plugins/arclite/headers.hpp
+++ b/plugins/arclite/headers.hpp
@@ -33,7 +33,7 @@ using namespace std::literals;
#include <basetyps.h>
#include "CPP/7zip/Archive/IArchive.h"
#include "CPP/7zip/IPassword.h"
-#include "CPP/7Zip/ICoder.h"
+#include "CPP/7zip/ICoder.h"
#include "plugin.hpp"
#include "farcolor.hpp"
diff --git a/plugins/emenu/FarMenu.h b/plugins/emenu/FarMenu.h
index 19e604886..d39d402a9 100644
--- a/plugins/emenu/FarMenu.h
+++ b/plugins/emenu/FarMenu.h
@@ -2,7 +2,7 @@
#define _FARMENU_H_
#include <plugin.hpp>
-#include <Guiddef.h>
+#include <guiddef.h>
class CFarMenu
{
diff --git a/plugins/emenu/Plugin.cpp b/plugins/emenu/Plugin.cpp
index ce43649db..5cf455cdf 100644
--- a/plugins/emenu/Plugin.cpp
+++ b/plugins/emenu/Plugin.cpp
@@ -39,7 +39,7 @@ _COM_SMARTPTR_TYPEDEF(IDataObject, __uuidof(IDataObject));
#endif
#if _WIN32_WINNT >= 0x0603
-# include <VersionHelpers.h>
+# include <versionhelpers.h>
#else
inline bool IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor)
{
diff --git a/plugins/farcmds/makefile_gcc b/plugins/farcmds/makefile_gcc
index 35d59e86b..0e7e3b589 100644
--- a/plugins/farcmds/makefile_gcc
+++ b/plugins/farcmds/makefile_gcc
@@ -1,4 +1,4 @@
-NAME = FarCmds
+NAME = FARCmds
SRCS = FARCmds.cpp Mix.cpp OpenCmd.cpp
DOCS = FARCmdsEng.hlf FARCmdsRus.hlf FARCmdsPol.hlf FARCmdsEng.lng FARCmdsRus.lng FARCmdsSky.lng FARCmdsSpa.lng FARCmdsIta.lng FARCmdsBel.lng FARCmdsPol.lng changelog
USERLIBS = -lole32 -luuid -lrpcrt4
diff --git a/plugins/luamacro/luafar/win.c b/plugins/luamacro/luafar/win.c
index 8ca8c46e6..159b47f74 100644
--- a/plugins/luamacro/luafar/win.c
+++ b/plugins/luamacro/luafar/win.c
@@ -1,5 +1,5 @@
#include <windows.h>
-#include <VersionHelpers.h>
+#include <versionhelpers.h>
#include "reg.h"
#include "util.h"
#include "ustring.h"
diff --git a/plugins/proclist/Plist.cpp b/plugins/proclist/Plist.cpp
index 362301194..cec2688d5 100644
--- a/plugins/proclist/Plist.cpp
+++ b/plugins/proclist/Plist.cpp
@@ -4,7 +4,7 @@
#include <vector>
-#include <Psapi.h>
+#include <psapi.h>
// obtained from PSAPI.DLL
/*
diff --git a/plugins/proclist/makefile_gcc b/plugins/proclist/makefile_gcc
index c5fe91965..56adbcf4c 100644
--- a/plugins/proclist/makefile_gcc
+++ b/plugins/proclist/makefile_gcc
@@ -1,4 +1,4 @@
-NAME = ProcList
+NAME = Proclist
SRCS = Proclist.cpp \
fileio.cpp \
handles.cpp \
--
2.20.1
|
|
|
b88834c7a |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2020-03-22 19:40 | romanbtl | New Issue | |
| 2020-03-22 19:40 | romanbtl | File Added: 0001-Support-building-on-mingw64-headers.patch | |
| 2020-03-22 19:40 | romanbtl | File Added: 0002-Support-building-on-mingw64-ico.patch | |
| 2020-03-22 19:40 | romanbtl | File Added: 0003-Support-building-on-mingw64-plugins.patch | |
| 2020-03-22 23:52 | DrKnS | Assigned To | => DrKnS |
| 2020-03-22 23:52 | DrKnS | Status | new => closed |
| 2020-03-22 23:52 | DrKnS | Resolution | open => fixed |
| 2020-03-22 23:52 | DrKnS | Fixed in Version | => 3.0 |
| 2020-03-22 23:52 | DrKnS | Build | => 5575 |
| 2020-03-22 23:52 | DrKnS | Note Added: 0016754 |