From 9655fa358906af7c3df5f4ad258156f9c719ed1d Mon Sep 17 00:00:00 2001
From: berryzplus <berryzplus@gmail.com>
Date: Sun, 9 May 2021 16:45:37 +0900
Subject: [PATCH 1/2] =?UTF-8?q?MinGW=20Makefile=E3=81=ABbregonig=E3=81=A8c?=
 =?UTF-8?q?tags=E3=81=AEzip=E5=B1=95=E9=96=8B=E3=82=92=E7=B5=84=E3=81=BF?=
 =?UTF-8?q?=E8=BE=BC=E3=82=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template.steps.install-mingw-w64-gcc.yml       |  3 +++
 sakura_core/Makefile                               | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml b/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml
index 07f0075568..ec2938ad21 100644
--- a/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml
+++ b/ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml
@@ -5,5 +5,8 @@
 #       なし
 #############################################################################################################
 steps:
+  - script: C:\msys64\usr\bin\bash --login -c "pacman -S --noconfirm p7zip"
+    displayName: install 7zip
+
   - script: C:\msys64\usr\bin\bash --login -c "pacman -S --noconfirm mingw-w64-x86_64-gtest"
     displayName: install MinGW-w64-gtest
diff --git a/sakura_core/Makefile b/sakura_core/Makefile
index d984b90302..6348d1c88f 100644
--- a/sakura_core/Makefile
+++ b/sakura_core/Makefile
@@ -31,6 +31,7 @@ DIRSEP = $(strip \ )
 DEVNULL = NUL
 ICONV = C:\msys64\usr\bin\iconv.exe
 SED = C:\msys64\usr\bin\sed.exe
+P7Z = "C:\Program Files\7-Zip\7z.exe"
 else
 # If unix-like shell is used.
 MKDIR = mkdir -p
@@ -39,6 +40,7 @@ DIRSEP = /
 DEVNULL = /dev/null
 ICONV = iconv
 SED = sed
+P7Z = 7z
 endif
 
 ifndef PREFIX
@@ -100,6 +102,8 @@ LIBS= \
  $(MYLIBS)
 
 exe= $(or $(OUTDIR),.)/sakura.exe
+bregonig= $(or $(OUTDIR),.)/bregonig.dll
+ctags= $(or $(OUTDIR),.)/ctags.exe
 
 SRCS = $(wildcard $(SRCDIR)/*.cpp) \
        $(wildcard $(SRCDIR)/*/*.cpp) \
@@ -120,11 +124,19 @@ GENERATED_FILES= \
 HEADERMAKETOOLDIR= $(SRCDIR)/../HeaderMake
 HEADERMAKE= $(or $(OUTDIR),$(HEADERMAKETOOLDIR))/HeaderMake.exe
 
-all: $(exe)
+all: $(exe) \
+     $(bregonig) \
+     $(ctags)
 
 $(exe): $(OBJS) sakura_rc.o
 	$(CXX) -o $@ $(OBJS) sakura_rc.o $(LIBS)
 
+$(bregonig): ../installer/externals/bregonig/bron420.zip
+	$(P7Z) e $< -o$(@D) -y x64/$(@F)
+
+$(ctags): ../installer/externals/universal-ctags/ctags-2020-01-12_feffe43a-x64.zip
+	$(P7Z) e $< -o$(@D) -y $(@F)
+
 Funccode_define.h: Funccode_x.hsrc $(HEADERMAKE)
 	$(HEADERMAKE) -in=$< -out=$@ -mode=define
 

From 9c5387b181b0aa0b275daaaab0155f948f3d8493 Mon Sep 17 00:00:00 2001
From: berryzplus <berryzplus@gmail.com>
Date: Mon, 10 May 2021 19:05:38 +0900
Subject: [PATCH 2/2] =?UTF-8?q?7z=E3=81=AE=E3=83=91=E3=82=B9=E3=82=92?=
 =?UTF-8?q?=E8=A8=82=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

windows向けの7zではなくmsys2版のパスを記載するよう修正
---
 sakura_core/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sakura_core/Makefile b/sakura_core/Makefile
index 6348d1c88f..1dad0cf0e0 100644
--- a/sakura_core/Makefile
+++ b/sakura_core/Makefile
@@ -31,7 +31,7 @@ DIRSEP = $(strip \ )
 DEVNULL = NUL
 ICONV = C:\msys64\usr\bin\iconv.exe
 SED = C:\msys64\usr\bin\sed.exe
-P7Z = "C:\Program Files\7-Zip\7z.exe"
+P7Z = C:\msys64\usr\bin\7z
 else
 # If unix-like shell is used.
 MKDIR = mkdir -p