diff options
| author | Neil <nyamatongwe@gmail.com> | 2016-02-24 19:39:12 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2016-02-24 19:39:12 +1100 |
| commit | 231e72eb574a4e895e5e6e30a96bfe3a5d2b2923 (patch) | |
| tree | 7ff7f4eabbd9b9940a0a09b9de43d251934ca35e | |
| parent | 3163777c1d30783a35b73b3e79cf39179d21feee (diff) | |
| download | scintilla-mirror-231e72eb574a4e895e5e6e30a96bfe3a5d2b2923.tar.gz | |
Bug [#1813]. Unmangle exported Scintilla_DirectFunction.
Backed out changeset: 819f953e432b
| -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 fab7d0795..668812553 100644 --- a/win32/makefile +++ b/win32/makefile @@ -96,7 +96,7 @@ BASEOBJS = \ SOBJS = ScintillaWin.o ScintillaBase.o $(BASEOBJS) -$(COMPONENT): $(SOBJS) +$(COMPONENT): $(SOBJS) Scintilla.def $(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(SOBJS) $(CXXFLAGS) $(LIBS) LOBJS = \ @@ -112,7 +112,7 @@ LOBJS = \ WordList.o \ $(BASEOBJS) \ $(LEXOBJS) -$(LEXCOMPONENT): $(LOBJS) +$(LEXCOMPONENT): $(LOBJS) Scintilla.def $(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(LOBJS) $(CXXFLAGS) $(LIBS) $(LEXLIB): $(LEXOBJS) diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 9e4503b78..e0d16f387 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) -DLL -OUT:$@ $** $(LIBS) + $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS) $(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res - $(LD) $(LDFLAGS) -DLL -OUT:$@ $** $(LIBS) + $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS) $(LEXLIB): $(LEXOBJS) LIB /OUT:$@ $(LEXOBJS) |