From 6750be34328a274d829a9c19f4369a598b4a98a5 Mon Sep 17 00:00:00 2001
From: Christian Grasser <christian.grasser@live.de>
Date: Sat, 24 Apr 2021 02:51:07 +0200
Subject: [PATCH] Fix for darkmode build with mingw

Close #9789
---
 PowerEditor/gcc/makefile              | 18 ++++++++++++++----
 PowerEditor/src/DarkMode/DarkMode.cpp |  2 --
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/PowerEditor/gcc/makefile b/PowerEditor/gcc/makefile
index 241f7031c..4723d4a02 100644
--- a/PowerEditor/gcc/makefile
+++ b/PowerEditor/gcc/makefile
@@ -18,7 +18,10 @@
 NPP_DIR			= ../src
 SCI_DIR			= ../../scintilla/include
 GCC_DIR			= .
-GCCINCLUDE_DIR  = $(GCC_DIR)/include
+GCCINCLUDE_DIR	= $(GCC_DIR)/include
+
+#darkmode:
+DARKMODE_DIR	= $(NPP_DIR)/darkmode
 
 #json:
 JSON_DIR		= $(NPP_DIR)/json
@@ -79,7 +82,10 @@ WIN_DIR			= $(NPP_DIR)/WinControls
 
 # Sources:
 SRC_NPP			= $(wildcard $(NPP_DIR)/*.cpp)
-SRC_GCCINCLUDE  = $(wildcard $(GCCINCLUDE_DIR)/*.cpp)
+SRC_GCCINCLUDE	= $(wildcard $(GCCINCLUDE_DIR)/*.cpp)
+
+#DARKMODE
+SRC_DARKMODE	= $(wildcard $(DARKMODE_DIR)/*.cpp)
 
 #MISC
 SRC_MISC		= $(wildcard $(MISC_DIR)/*.cpp)
@@ -136,7 +142,10 @@ SRC_WIN			= $(wildcard $(WIN_DIR)/*.cpp)
 
 # Objects:
 OBJ_NPP			= $(patsubst %.cpp,%.o,$(SRC_NPP))
-OBJ_GCCINCLUDE  = $(patsubst %.cpp,%.o,$(SRC_GCCINCLUDE))
+OBJ_GCCINCLUDE	= $(patsubst %.cpp,%.o,$(SRC_GCCINCLUDE))
+
+#DARKMODE
+OBJ_DARKMODE	= $(patsubst %.cpp,%.o,$(SRC_DARKMODE))
 
 #MISC
 OBJ_MISC		= $(patsubst %.cpp,%.o,$(SRC_MISC))
@@ -210,8 +219,9 @@ OBJS_WIN		= $(OBJ_WIN) $(OBJ_ABOUT) $(OBJ_ANSICHAR) $(OBJ_CLIPBOARD) $(OBJ_CONTE
 OBJS_UCHARDET	= $(OBJ_UCHARDET)
 OBJS_TIXML		= $(OBJ_TIXML) $(OBJ_TIXMLA)
 OBJS_SCINT		= $(OBJ_SCINT)
+OBJS_DARKMODE	= $(OBJ_DARKMODE)
 OBJS_MISC		= $(OBJ_MISC) $(OBJ_COMMON) $(OBJ_EXCEPTION) $(OBJ_MD5) $(OBJ_SHA2) $(OBJ_PLUGINS) $(OBJ_PROCESS) $(OBJ_REGEXT)
-OBJS			= $(OBJ_NPP) $(OBJS_WIN) $(OBJS_UCHARDET) $(OBJS_TIXML) $(OBJS_SCINT) $(OBJS_MISC) $(OBJ_GCCINCLUDE)
+OBJS			= $(OBJ_NPP) $(OBJS_WIN) $(OBJS_UCHARDET) $(OBJS_TIXML) $(OBJS_SCINT) $(OBJS_MISC) $(OBJS_DARKMODE) $(OBJ_GCCINCLUDE)
 
 # Main resource file
 SRC_RES			= ./resources.rc
diff --git a/PowerEditor/src/DarkMode/DarkMode.cpp b/PowerEditor/src/DarkMode/DarkMode.cpp
index 23f1d54aa..e53059c62 100644
--- a/PowerEditor/src/DarkMode/DarkMode.cpp
+++ b/PowerEditor/src/DarkMode/DarkMode.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <Windows.h>
 
 #include "DarkMode.h"