diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-12-16 09:14:32 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-12-16 09:14:32 +1100 |
| commit | 579c8f3dc007c4b7f0b57c68edd7d67bc7e11b88 (patch) | |
| tree | 02210792c111ba2f0b6ffc9ae146f6a7da80da68 | |
| parent | 497d552e0d6042a392ea21a3ba086ebb41c1b3e7 (diff) | |
| download | scintilla-mirror-579c8f3dc007c4b7f0b57c68edd7d67bc7e11b88.tar.gz | |
Don't use .DEF file as it is not needed.
| -rw-r--r-- | win32/makefile | 4 | ||||
| -rw-r--r-- | win32/scintilla.mak | 4 |
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) |