aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2015-12-16 09:14:32 +1100
committerNeil <nyamatongwe@gmail.com>2015-12-16 09:14:32 +1100
commitbe11ce310c1ed11e2ed7bdfc0281429afb71b2ef (patch)
tree3330996432bfb9f797e0039984ae768811135a1e
parent018fe1c9237f62fc6a2ddd45da6992abda68ed79 (diff)
downloadscintilla-mirror-be11ce310c1ed11e2ed7bdfc0281429afb71b2ef.tar.gz
Don't use .DEF file as it is not needed.
-rw-r--r--win32/makefile4
-rw-r--r--win32/scintilla.mak4
2 files changed, 4 insertions, 4 deletions
diff --git a/win32/makefile b/win32/makefile
index 668812553..fab7d0795 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -96,7 +96,7 @@ BASEOBJS = \
SOBJS = ScintillaWin.o ScintillaBase.o $(BASEOBJS)
-$(COMPONENT): $(SOBJS) Scintilla.def
+$(COMPONENT): $(SOBJS)
$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(SOBJS) $(CXXFLAGS) $(LIBS)
LOBJS = \
@@ -112,7 +112,7 @@ LOBJS = \
WordList.o \
$(BASEOBJS) \
$(LEXOBJS)
-$(LEXCOMPONENT): $(LOBJS) Scintilla.def
+$(LEXCOMPONENT): $(LOBJS)
$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(LOBJS) $(CXXFLAGS) $(LIBS)
$(LEXLIB): $(LEXOBJS)
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index e0d16f387..9e4503b78 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -228,10 +228,10 @@ $(DIR_O)\ScintRes.res : ScintRes.rc
$(RC) -fo$@ $**
$(COMPONENT): $(SOBJS) $(DIR_O)\ScintRes.res
- $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
+ $(LD) $(LDFLAGS) -DLL -OUT:$@ $** $(LIBS)
$(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res
- $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
+ $(LD) $(LDFLAGS) -DLL -OUT:$@ $** $(LIBS)
$(LEXLIB): $(LEXOBJS)
LIB /OUT:$@ $(LEXOBJS)