tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for darkmode build with mingw 

Close #9789
This commit is contained in:
Christian Grasser 2021-04-24 02:51:07 +02:00 committed by Don HO
parent 5a3bf49c86
commit 6750be3432
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PowerEditor/gcc/makefile
View File

@ -18,7 +18,10 @@
NPP_DIR = ../src NPP_DIR = ../src
SCI_DIR = ../../scintilla/include SCI_DIR = ../../scintilla/include
GCC_DIR = . GCC_DIR = .
GCCINCLUDE_DIR = $(GCC_DIR)/include GCCINCLUDE_DIR = $(GCC_DIR)/include
#darkmode:
DARKMODE_DIR = $(NPP_DIR)/darkmode
#json: #json:
JSON_DIR = $(NPP_DIR)/json JSON_DIR = $(NPP_DIR)/json
@ -79,7 +82,10 @@ WIN_DIR = $(NPP_DIR)/WinControls
# Sources: # Sources:
SRC_NPP = $(wildcard $(NPP_DIR)/*.cpp) 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 #MISC
SRC_MISC = $(wildcard $(MISC_DIR)/*.cpp) SRC_MISC = $(wildcard $(MISC_DIR)/*.cpp)
@ -136,7 +142,10 @@ SRC_WIN = $(wildcard $(WIN_DIR)/*.cpp)
# Objects: # Objects:
OBJ_NPP = $(patsubst %.cpp,%.o,$(SRC_NPP)) 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 #MISC
OBJ_MISC = $(patsubst %.cpp,%.o,$(SRC_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_UCHARDET = $(OBJ_UCHARDET)
OBJS_TIXML = $(OBJ_TIXML) $(OBJ_TIXMLA) OBJS_TIXML = $(OBJ_TIXML) $(OBJ_TIXMLA)
OBJS_SCINT = $(OBJ_SCINT) 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_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 # Main resource file
SRC_RES = ./resources.rc SRC_RES = ./resources.rc

2
PowerEditor/src/DarkMode/DarkMode.cpp
View File

@ -1,5 +1,3 @@
#pragma once
#include <Windows.h> #include <Windows.h>
#include "DarkMode.h" #include "DarkMode.h"