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

[MinGW] Restore the original Scintilla makefile 

For the sake of maintenance of Scintilla (future update), we try to not modify Scintilla project, or at least minimize its modification.
Hence the compiling boost part is shifted to Notepad++ project.

Fix #11014, close #11485
This commit is contained in:
ArkadiuszMichalski 2022-04-06 18:37:15 +02:00 committed by Don Ho
parent 7fa6fb083b
commit 46ce9c31df
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PowerEditor/gcc/makefile
View File

@ -116,7 +116,6 @@ LEXILLA_TARGET_PATH := ../../PowerEditor/gcc/$(LEXILLA_TARGET)
LEXILLA_BUILD_DIRECTORY := $(BUILD_DIRECTORY)/_lexilla.build LEXILLA_BUILD_DIRECTORY := $(BUILD_DIRECTORY)/_lexilla.build
LEXILLA_BUILD_PATH := ../../PowerEditor/gcc/$(LEXILLA_BUILD_DIRECTORY) LEXILLA_BUILD_PATH := ../../PowerEditor/gcc/$(LEXILLA_BUILD_DIRECTORY)
LD_PATH += $(BUILD_DIRECTORY) LD_PATH += $(BUILD_DIRECTORY)
# detect a build outside of PowerEditor/gcc and update dependent variables # detect a build outside of PowerEditor/gcc and update dependent variables
@ -226,7 +225,7 @@ $(LEXILLA_TARGET): .force
endif endif
$(SCINTILLA_TARGET): | $(BUILD_DIRECTORY) $(SCINTILLA_BUILD_DIRECTORY) $(SCINTILLA_TARGET): | $(BUILD_DIRECTORY) $(SCINTILLA_BUILD_DIRECTORY)
$(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(SCINTILLA_DIRECTORY)/win32 DIR_O=$(SCINTILLA_BUILD_PATH) LIBSCI=$(SCINTILLA_TARGET_PATH) $(SCINTILLA_TARGET_PATH) $(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(SCINTILLA_DIRECTORY)/win32 -f makefile -f ../../boostregex/nppSpecifics_mingw.mak DIR_O=$(SCINTILLA_BUILD_PATH) LIBSCI=$(SCINTILLA_TARGET_PATH) $(SCINTILLA_TARGET_PATH)
$(LEXILLA_TARGET): | $(BUILD_DIRECTORY) $(LEXILLA_BUILD_DIRECTORY) $(LEXILLA_TARGET): | $(BUILD_DIRECTORY) $(LEXILLA_BUILD_DIRECTORY)
$(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(LEXILLA_DIRECTORY)/src DIR_O=$(LEXILLA_BUILD_PATH) LIBLEXILLA=$(LEXILLA_TARGET_PATH) $(LEXILLA_TARGET_PATH) $(AT)$(MAKE) $(SUBMAKEFLAGS) -C $(LEXILLA_DIRECTORY)/src DIR_O=$(LEXILLA_BUILD_PATH) LIBLEXILLA=$(LEXILLA_TARGET_PATH) $(LEXILLA_TARGET_PATH)

31
boostregex/nppSpecifics_mingw.mak
View File

@ -1,25 +1,26 @@
# This makefile should be included in the main scintilla.mak file, # This makefile should be listed after main Scintilla makefile
# just after where LOBJS is defined (around line # by using the -f option for both makefiles
#
# The following line should be added around line 211 of scintilla.mak
# !INCLUDE nppSpecifics.mak
# Set your boost path (the root of where you've unpacked your boost zip). # Set your boost path (the root of where you've unpacked your boost zip).
# Boost is available from www.boost.org # Boost is available from www.boost.org
SRC_OBJS+=\ DIR_BOOST = ../../boostregex
$(DIR_O)/BoostRegexSearch.o \
vpath %.h $(DIR_BOOST)
vpath %.cxx $(DIR_BOOST)
INCLUDES += -I $(DIR_BOOST)
CXXFLAGS += -DSCI_OWNREGEX
BOOST_OBJS = \
$(DIR_O)/BoostRegExSearch.o \
$(DIR_O)/UTF8DocumentIterator.o $(DIR_O)/UTF8DocumentIterator.o
INCLUDES+= -I../../boostregex $(BOOST_OBJS): $(DIR_O)/%.o: %.cxx
$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -MMD -c $< -o $@
CXXFLAGS+= -DSCI_OWNREGEX $(LIBSCI): $(BOOST_OBJS)
-include $(BOOST_OBJS:.o=.d)
$(DIR_O)/UTF8DocumentIterator.o:: ../../boostregex/UTF8DocumentIterator.cxx
$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -c $< -o $@
$(DIR_O)/BoostRegexSearch.o:: ../../boostregex/BoostRegexSearch.cxx ../src/CharClassify.h ../src/RESearch.h
$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -c $< -o $@

3
scintilla/win32/makefile
View File

@ -113,9 +113,6 @@ SRC_OBJS = \
$(DIR_O)/ViewStyle.o \ $(DIR_O)/ViewStyle.o \
$(DIR_O)/XPM.o $(DIR_O)/XPM.o
# To have PCRE boost regex with header only is integrated and not just the one from std
include ../../boostregex/nppSpecifics_mingw.mak
COMPONENT_OBJS = \ COMPONENT_OBJS = \
$(SRC_OBJS) \ $(SRC_OBJS) \
$(DIR_O)/HanjaDic.o \ $(DIR_O)/HanjaDic.o \