From 1cde96f1e2f1db37a504549f796addd742b3f30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Ust=C3=BB=C5=BEanin?= <unknown>
Date: Thu, 30 Sep 2021 19:15:26 +1000
Subject: Bug [#2283] Remove ScintillaDLL.o and ScintRes.o from static library
 as only needed by DLL.

---
 win32/makefile      | 6 ++++--
 win32/scintilla.mak | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'win32')

diff --git a/win32/makefile b/win32/makefile
index c09d8d74a..abb9b41e7 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -117,11 +117,13 @@ COMPONENT_OBJS = \
 	HanjaDic.o \
 	PlatWin.o \
 	ScintillaBase.o \
+	ScintillaWin.o
+
+SHARED_OBJS = \
 	ScintillaDLL.o \
-	ScintillaWin.o \
 	ScintRes.o
 
-$(COMPONENT): $(COMPONENT_OBJS)
+$(COMPONENT): $(COMPONENT_OBJS) $(SHARED_OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
 
 $(LIBSCI): $(COMPONENT_OBJS)
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index ed40818ef..51f34bcc3 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -112,14 +112,16 @@ COMPONENT_OBJS = \
 	$(DIR_O)\HanjaDic.obj \
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\ScintillaBase.obj \
-	$(DIR_O)\ScintillaDLL.obj \
 	$(DIR_O)\ScintillaWin.obj \
 	$(SRC_OBJS)
 
+SHARED_OBJS = \
+	$(DIR_O)\ScintillaDLL.obj
+
 $(DIR_O)\ScintRes.res : ScintRes.rc
 	$(RC) -fo$@ $**
 
-$(COMPONENT): $(COMPONENT_OBJS) $(DIR_O)\ScintRes.res
+$(COMPONENT): $(COMPONENT_OBJS) $(SHARED_OBJS) $(DIR_O)\ScintRes.res
 	$(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
 
 $(LIBSCI): $(COMPONENT_OBJS)
-- 
cgit v1.2.3