diff options
| author | nyamatongwe <unknown> | 2010-06-15 03:53:00 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2010-06-15 03:53:00 +0000 |
| commit | 04be6fc5ca77516605815742f3d47534b71e9343 (patch) | |
| tree | f7eb8c4d9966fa235d5af9e6e3b1e9344d6b544f | |
| parent | c633a069e8ba1a7ca6feb7d36e05cd77568bb906 (diff) | |
| download | scintilla-mirror-04be6fc5ca77516605815742f3d47534b71e9343.tar.gz | |
Switched from dllwrap to g++ -shared to make work with TDM GCC 4.5.
| -rw-r--r-- | win32/makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/makefile b/win32/makefile index 94b95d1f7..2e51ce2d5 100644 --- a/win32/makefile +++ b/win32/makefile @@ -6,7 +6,7 @@ .SUFFIXES: .cxx CC = g++ -DLLWRAP = dllwrap +DLLWRAP = g++ -shared -Wl,--kill-at DEL = del /q COMPONENT = ../bin/Scintilla.dll @@ -46,7 +46,7 @@ SOBJS = ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Decoration.o \ ScintRes.o PlatWin.o PositionCache.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \ Selection.o Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o XPM.o PerLine.o $(COMPONENT): $(SOBJS) Scintilla.def - $(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable + $(DLLWRAP) --add-stdcall-alias --target=i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Decoration.o \ Document.o ContractionState.o CellBuffer.o CallTip.o \ @@ -54,7 +54,7 @@ LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Decoration.o \ Selection.o Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \ DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o XPM.o PerLine.o $(LEXOBJS) $(LEXCOMPONENT): $(LOBJS) Scintilla.def - $(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable + $(DLLWRAP) --add-stdcall-alias --target=i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable $(LEXLIB): $(LEXOBJS) $(AR) rc $@ $^ |