diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-29 09:37:46 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-29 09:37:46 +1100 |
| commit | 0e8b84a8747b9fe382bc291b1f07830363ca8c74 (patch) | |
| tree | ceaeb31cd813e7c6081b78cb33004111cef66e4a /win32 | |
| parent | 7f267544c8ab86d217e671379578e0c5b6f2e625 (diff) | |
| download | scintilla-mirror-0e8b84a8747b9fe382bc291b1f07830363ca8c74.tar.gz | |
Backport: Remove MinGW linker options that do not appear needed with recent versions of Mingw-w64.
add-stdcall-alias was added by revision 1106 in 2002
enable-runtime-pseudo-reloc-v2 was added by revision 3371 in 2010
Backport of changeset 7842:5899c8a8c448.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/win32/makefile b/win32/makefile index d34856b5d..56aed0ba0 100644 --- a/win32/makefile +++ b/win32/makefile @@ -21,7 +21,6 @@ CXX = clang++ CLANG_OPTS = -Wno-missing-braces -Wno-language-extension-token -Xclang -flto-visibility-public-std else # MinGW GCC -LDMINGW = -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--add-stdcall-alias LIBSMINGW = -lstdc++ STRIPOPTION = -s CXXSTD = gnu++0x @@ -39,7 +38,7 @@ vpath %.h ../src ../include ../lexlib vpath %.cxx ../src ../lexlib ../lexers vpath %.c ../lua/src -LDFLAGS=-shared -static -mwindows $(LDMINGW) +LDFLAGS=-shared -static -mwindows LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW) # Add -MMD to get dependencies INCLUDEDIRS=-I ../include -I ../src -I../lexlib |