aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/scintilla.mak
diff options
context:
space:
mode:
authormitchell <unknown>2020-01-03 19:46:53 -0500
committermitchell <unknown>2020-01-03 19:46:53 -0500
commitb6d260731bddb23d63f4a0990305b1d9501f7cf8 (patch)
tree2ec6039f887cb14498e469973b68aaca7a2c939e /win32/scintilla.mak
parent8eb134dbbd44002f3acd90d91550875f161136fa (diff)
downloadscintilla-mirror-b6d260731bddb23d63f4a0990305b1d9501f7cf8.tar.gz
Backport: Move collection of modules from Catalogue.cxx to CatalogueModules.h so it can be reused.
Backport of changeset 7866:fff1071ea1db.
Diffstat (limited to 'win32/scintilla.mak')
-rw-r--r--win32/scintilla.mak13
1 files changed, 1 insertions, 12 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index db855fc60..dd010ac63 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -239,7 +239,7 @@ SCILEX_OBJS = \
$(DIR_O)\HanjaDic.obj \
$(DIR_O)\PlatWin.obj \
$(DIR_O)\ScintillaBaseL.obj \
- $(DIR_O)\ScintillaWinL.obj
+ $(DIR_O)\ScintillaWin.obj
COMPONENT_OBJS = \
$(DIR_O)\HanjaDic.obj \
@@ -253,14 +253,6 @@ LEXCOMPONENT_OBJS = \
$(DIR_O)\ScintillaDLL.obj \
$(SCILEX_OBJS)
-SOBJS = \
- $(SRC_OBJS) \
- $(DIR_O)\HanjaDic.obj \
- $(DIR_O)\PlatWin.obj \
- $(DIR_O)\ScintillaBase.obj \
- $(DIR_O)\ScintillaWin.obj \
- $(DIR_O)\ScintillaDLL.obj
-
$(DIR_O)\ScintRes.res : ScintRes.rc
$(RC) -fo$@ $**
@@ -288,9 +280,6 @@ $(LIBSCI): $(SCILEX_OBJS)
$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx
$(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\ScintillaBase.cxx
-$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx
- $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ScintillaWin.cxx
-
# Dependencies
!IF EXISTS(nmdeps.mak)