From ead6fb6b8fe26a503bb91b8387f037565597dc24 Mon Sep 17 00:00:00 2001
From: Christian Grasser <christian.grasser@live.de>
Date: Sat, 17 Sep 2022 15:44:11 +0200
Subject: [PATCH] Fix gcc linux build and cmake build issues under ubuntu

1. Fix gcc build issues under ubuntu linux due to upper/lower case filename issues.
2. corrected cmake build issues.

Close  #12188
---
 PowerEditor/src/CMakeLists.txt                      | 12 ++++++------
 PowerEditor/src/DarkMode/DarkMode.cpp               |  6 +++---
 PowerEditor/src/Notepad_plus.rc                     |  2 +-
 PowerEditor/src/NppDarkMode.cpp                     |  6 +++---
 PowerEditor/src/NppDarkMode.h                       |  2 +-
 PowerEditor/src/WinControls/StatusBar/StatusBar.cpp |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/PowerEditor/src/CMakeLists.txt b/PowerEditor/src/CMakeLists.txt
index 945256a15..3a26dd8f4 100644
--- a/PowerEditor/src/CMakeLists.txt
+++ b/PowerEditor/src/CMakeLists.txt
@@ -28,7 +28,7 @@ SET(projIncludDir	../../scintilla/include/
 					./MISC/SysMsg/
 					./WinControls/StatusBar/
 					./WinControls/StaticDialog/RunDlg/
-					./tinyxml/
+					./TinyXml/
 					./WinControls/ColourPicker/
 					./Win32Explr/
 					./MISC/RegExt/
@@ -45,7 +45,7 @@ SET(projIncludDir	../../scintilla/include/
 					./WinControls/ToolTip/
 					./MISC/Exception/
 					./MISC/Common/
-					./tinyxml/tinyXmlA/
+					./TinyXml/tinyXmlA/
 					./WinControls/AnsiCharPanel/
 					./WinControls/ClipboardHistory/
 					./WinControls/FindCharsInRange/
@@ -144,7 +144,7 @@ SET(src_files
 			./uchardet/nsUniversalDetector.cpp
 			./uchardet/nsUTF8Prober.cpp
 			./Parameters.cpp
-			./Misc/PluginsManager/PluginsManager.cpp
+			./MISC/PluginsManager/PluginsManager.cpp
 			./WinControls/Preference/preferenceDlg.cpp
 			./ScintillaComponent/Printer.cpp
 			./WinControls/ProjectPanel/ProjectPanel.cpp
@@ -381,7 +381,7 @@ SET(rcFiles
 
 IF (WIN32)
 	SET(option WIN32)
-	SET(win32_LIBRARIES comctl32 shlwapi dbghelp version crypt32 wintrust sensapi wininet imm32 msimg32)
+	SET(win32_LIBRARIES comctl32 shlwapi dbghelp version crypt32 wintrust sensapi wininet imm32 msimg32 uxtheme)
 if ( MSVC )
 	#do not use for mingw builds
 	SET(CMAKE_CXX_FLAGS "/EHa /MP /W4")
@@ -390,7 +390,7 @@ if ( MSVC )
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 else ( MSVC )
 	# For possible MinGW compilation
-	SET(CMAKE_CXX_FLAGS "-include../gcc/include/various.h -std=c++17 -fpermissive -municode")
+	SET(CMAKE_CXX_FLAGS "-include../gcc/gcc-fixes.h -std=c++17 -fpermissive -municode")
 	SET(defs -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0600 -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL )
 endif ( MSVC )
 ENDIF (WIN32)
@@ -414,5 +414,5 @@ find_library(LEXILLA_STATIC_LIBRARY
 ADD_EXECUTABLE(notepad++ ${option} ${src_files} ${include_files} ${rcFiles})
 
 
-TARGET_LINK_LIBRARIES (notepad++ ${win32_LIBRARIES} ${SCINTILLA_STATIC_LIBRARY} ${LEXILLA_STATIC_LIBRARY})
+TARGET_LINK_LIBRARIES (notepad++ ${SCINTILLA_STATIC_LIBRARY} ${LEXILLA_STATIC_LIBRARY} ${win32_LIBRARIES})
 
diff --git a/PowerEditor/src/DarkMode/DarkMode.cpp b/PowerEditor/src/DarkMode/DarkMode.cpp
index 33e5ebbe7..a6de389fe 100644
--- a/PowerEditor/src/DarkMode/DarkMode.cpp
+++ b/PowerEditor/src/DarkMode/DarkMode.cpp
@@ -1,11 +1,11 @@
-#include <Windows.h>
+#include <windows.h>
 
 #include "DarkMode.h"
 
 #include "IatHook.h"
 
-#include <Uxtheme.h>
-#include <Vssym32.h>
+#include <uxtheme.h>
+#include <vssym32.h>
 
 #include <unordered_set>
 #include <mutex>
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 4d97103f4..07f7ac106 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -381,7 +381,7 @@ IDI_FUNCLIST_RELOADBUTTON_DM       BITMAP      "icons/darkMode/panels/funclstRel
 IDI_FUNCLIST_PREFERENCEBUTTON_DM   BITMAP      "icons/darkMode/panels/funclstPreferences.bmp"
 
 
-IDI_GET_INFO_FROM_TOOLTIP       ICON        "icons/MoreOnTooltip.ico"
+IDI_GET_INFO_FROM_TOOLTIP       ICON        "icons/moreOnTooltip.ico"
 
 IDR_M30_MENU MENU
 BEGIN
diff --git a/PowerEditor/src/NppDarkMode.cpp b/PowerEditor/src/NppDarkMode.cpp
index 5aff336d4..254ec2a2b 100644
--- a/PowerEditor/src/NppDarkMode.cpp
+++ b/PowerEditor/src/NppDarkMode.cpp
@@ -20,13 +20,13 @@
 #include "DarkMode/DarkMode.h"
 #include "DarkMode/UAHMenuBar.h"
 
-#include <Uxtheme.h>
-#include <Vssym32.h>
+#include <uxtheme.h>
+#include <vssym32.h>
 
 #include "Parameters.h"
 #include "resource.h"
 
-#include <Shlwapi.h>
+#include <shlwapi.h>
 
 #include <array>
 
diff --git a/PowerEditor/src/NppDarkMode.h b/PowerEditor/src/NppDarkMode.h
index 0ebb28c70..b95d09b7f 100644
--- a/PowerEditor/src/NppDarkMode.h
+++ b/PowerEditor/src/NppDarkMode.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <Windows.h>
+#include <windows.h>
 
 constexpr COLORREF HEXRGB(DWORD rrggbb) {
 	// from 0xRRGGBB like natural #RRGGBB
diff --git a/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp b/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp
index ba79fd8cb..e0c38aa1a 100644
--- a/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp
+++ b/PowerEditor/src/WinControls/StatusBar/StatusBar.cpp
@@ -22,8 +22,8 @@
 #include <cassert>
 #include "Parameters.h"
 #include "NppDarkMode.h"
-#include <Uxtheme.h>
-#include <Vssym32.h>
+#include <uxtheme.h>
+#include <vssym32.h>
 
 //#define IDC_STATUSBAR 789