diff options
| author | nyamatongwe <unknown> | 2010-08-07 09:19:47 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2010-08-07 09:19:47 +1000 |
| commit | 3b6029becd9199f5556eedf88914e5ef702aedb2 (patch) | |
| tree | 15c506b8c36a8e954d91432f0911f2d9dfc2601e | |
| parent | 94f1ae8a538bc469ebcf9ae5a56e9ba067541831 (diff) | |
| download | scintilla-mirror-3b6029becd9199f5556eedf88914e5ef702aedb2.tar.gz | |
Ensure static linking of standard C++ library.
Some tidying.
| -rw-r--r-- | win32/makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/makefile b/win32/makefile index 5220c7277..20c30eedf 100644 --- a/win32/makefile +++ b/win32/makefile @@ -6,7 +6,6 @@ .SUFFIXES: .cxx CC = g++ -DLLWRAP = g++ -shared -Wl,--kill-at DEL = del /q COMPONENT = ../bin/Scintilla.dll @@ -16,7 +15,8 @@ LEXLIB = Lexers.a vpath %.h ../src ../include ../lexlib vpath %.cxx ../src ../lexlib ../lexers -LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid -mno-cygwin +LDFLAGS=-shared -static -Wl,--enable-runtime-pseudo-reloc-v2 -mno-cygwin -mwindows --relocatable -Wl,--add-stdcall-alias +LIBS=-lstdc++ -limm32 -lole32 -luuid # Add -MMD to get dependencies INCLUDEDIRS=-I ../include -I ../src -I../lexlib CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-strict-overflow -pedantic $(INCLUDEDIRS) -fno-rtti -mno-cygwin @@ -71,7 +71,7 @@ BASEOBJS = \ SOBJS = ScintillaWin.o ScintillaBase.o $(BASEOBJS) $(COMPONENT): $(SOBJS) Scintilla.def - $(DLLWRAP) --add-stdcall-alias --target=i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable + $(CC) $(LDFLAGS) -o $@ $(STRIPFLAG) $(SOBJS) $(CXXFLAGS) $(LIBS) LOBJS = \ Accessor.o \ @@ -87,7 +87,7 @@ LOBJS = \ $(BASEOBJS) \ $(LEXOBJS) $(LEXCOMPONENT): $(LOBJS) Scintilla.def - $(DLLWRAP) --add-stdcall-alias --target=i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) $(STRIPFLAG) --relocatable + $(CC) $(LDFLAGS) -o $@ $(STRIPFLAG) $(LOBJS) $(CXXFLAGS) $(LIBS) $(LEXLIB): $(LEXOBJS) $(AR) rc $@ $^ |