Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions build/VisualStudio/Notepad4.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="AVX2Debug|x64">
Expand Down Expand Up @@ -157,8 +157,8 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\..\scintilla\include;..\..\scintilla\lexlib;..\..\scintilla\src;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;STRICT_TYPED_ITEMIDS;BOOST_REGEX_STANDALONE;NO_CXX11_REGEX;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\scintilla\include;..\..\scintilla\lexlib;..\..\scintilla\src;..\..\src;..\..\darkmodelib\include;..\..\darkmodelib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;STRICT_TYPED_ITEMIDS;BOOST_REGEX_STANDALONE;NO_CXX11_REGEX;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_DARKMODELIB_NO_INI_CONFIG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level4</WarningLevel>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
Expand Down Expand Up @@ -592,6 +592,16 @@
<ClCompile Include="..\..\src\Helpers.cpp" />
<ClCompile Include="..\..\src\Notepad4.cpp" />
<ClCompile Include="..\..\src\Styles.cpp" />
<ClCompile Include="..\..\src\DarkMode.cpp" />
<ClCompile Include="..\..\darkmodelib\src\Darkmodelib.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibColor.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibDpi.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibHook.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibPaintHelper.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibSubclass.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibSubclassControl.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibSubclassWindow.cpp" />
<ClCompile Include="..\..\darkmodelib\src\DmlibWinApi.cpp" />
<ClCompile Include="..\..\src\EditLexers\stlABAQUS.cpp" />
<ClCompile Include="..\..\src\EditLexers\stlActionScript.cpp" />
<ClCompile Include="..\..\src\EditLexers\stlAPDL.cpp" />
Expand Down Expand Up @@ -758,6 +768,8 @@
<ClInclude Include="..\..\src\Resource.h" />
<ClInclude Include="..\..\src\SciCall.h" />
<ClInclude Include="..\..\src\Styles.h" />
<ClInclude Include="..\..\src\DarkMode.h" />
<ClInclude Include="..\..\darkmodelib\include\Darkmodelib.h" />
<ClInclude Include="..\..\src\Version.h" />
<ClInclude Include="..\..\src\VersionRev.h" />
</ItemGroup>
Expand Down
39 changes: 39 additions & 0 deletions build/VisualStudio/Notepad4.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
<Filter Include="Source Files\EditLexers">
<UniqueIdentifier>{b1934aa4-ee5f-4fb6-a9f8-2b410b6611eb}</UniqueIdentifier>
</Filter>
<Filter Include="DarkModeLib">
<UniqueIdentifier>{a1b2c3d4-e5f6-7890-abcd-ef0123456789}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\scintilla\lexers\LexAPDL.cxx">
Expand Down Expand Up @@ -435,6 +438,36 @@
<ClCompile Include="..\..\src\Styles.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\DarkMode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\Darkmodelib.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibColor.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibDpi.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibHook.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibPaintHelper.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibSubclass.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibSubclassControl.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibSubclassWindow.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\darkmodelib\src\DmlibWinApi.cpp">
<Filter>DarkModeLib</Filter>
</ClCompile>
<ClCompile Include="..\..\src\EditLexers\stlABAQUS.cpp">
<Filter>Source Files\EditLexers</Filter>
</ClCompile>
Expand Down Expand Up @@ -929,6 +962,12 @@
<ClInclude Include="..\..\src\Styles.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\DarkMode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\darkmodelib\include\Darkmodelib.h">
<Filter>DarkModeLib</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
17 changes: 14 additions & 3 deletions build/mingw/notepad4.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,27 @@ OBJDIR = $(BINFOLDER)/obj/$(PROJ)
SRCDIR = ../../src
editlexers_dir = $(SRCDIR)/EditLexers
scintilla_dir = ../../scintilla
darkmodelib_dir = ../../darkmodelib

INCDIR = \
-I"../../src" \
-I"../../src/EditLexers" \
-I"$(scintilla_dir)/include"
-I"$(scintilla_dir)/include" \
-I"$(darkmodelib_dir)/include" \
-I"$(darkmodelib_dir)/src"

CPPFLAGS += -D_DARKMODELIB_NO_INI_CONFIG

LDFLAGS += -L"$(BINFOLDER)/obj"

LDLIBS += -limm32
LDLIBS += -limm32 -ldwmapi

editlexers_src = $(wildcard $(editlexers_dir)/*.cpp)
editlexers_obj = $(patsubst $(editlexers_dir)/%.cpp,$(OBJDIR)/%.obj,$(editlexers_src))

darkmodelib_src = $(wildcard $(darkmodelib_dir)/src/*.cpp)
darkmodelib_obj = $(patsubst $(darkmodelib_dir)/src/%.cpp,$(OBJDIR)/dmlib_%.obj,$(darkmodelib_src))

# c_src = $(wildcard $(SRCDIR)/*.c)
# c_obj = $(patsubst $(SRCDIR)/%.c,$(OBJDIR)/%.obj,$(c_src))

Expand All @@ -30,12 +38,15 @@ rc_obj = $(patsubst $(SRCDIR)/%.rc,$(OBJDIR)/%.res,$(rc_src))

all: $(NAME)

$(NAME): $(editlexers_obj) $(cpp_obj) $(rc_obj)
$(NAME): $(editlexers_obj) $(cpp_obj) $(darkmodelib_obj) $(rc_obj)
$(CXX) $^ $(LDFLAGS) -lscintilla $(LDLIBS) -o $@

$(editlexers_obj): $(OBJDIR)/%.obj: $(editlexers_dir)/%.cpp
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCDIR) $< -o $(OBJDIR)/$*.obj

$(darkmodelib_obj): $(OBJDIR)/dmlib_%.obj: $(darkmodelib_dir)/src/%.cpp
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(INCDIR) $< -o $@

# $(c_obj): $(OBJDIR)/%.obj: $(SRCDIR)/%.c
# $(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCDIR) $< -o $(OBJDIR)/$*.obj

Expand Down
Loading