diff options
| author | Ivan Ustûžanin <unknown> | 2021-09-30 19:15:26 +1000 |
|---|---|---|
| committer | Ivan Ustûžanin <unknown> | 2021-09-30 19:15:26 +1000 |
| commit | 1cde96f1e2f1db37a504549f796addd742b3f30c (patch) | |
| tree | d6ed3821f95992257efec30455bfb4d8fc9e7302 | |
| parent | a4260678cb381e5fc9264b005d9013555e9f2a68 (diff) | |
| download | scintilla-mirror-1cde96f1e2f1db37a504549f796addd742b3f30c.tar.gz | |
Bug [#2283] Remove ScintillaDLL.o and ScintRes.o from static library as only
needed by DLL.
| -rw-r--r-- | win32/makefile | 6 | ||||
| -rw-r--r-- | win32/scintilla.mak | 6 |
2 files changed, 8 insertions, 4 deletions
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) |