diff options
| author | Joe Stringer <joe@wand.net.nz> | 2019-10-05 18:37:45 -0700 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2019-10-07 21:36:00 +0200 |
| commit | 48fd7b279222c1288004bf1bf8466d1084fbbf4b (patch) | |
| tree | 53286dc1a0ab4d09f4dd52daecc912daee529140 | |
| parent | b4f1056097fda5a6023437b84bc6382943075fcb (diff) | |
| download | openttd-48fd7b279222c1288004bf1bf8466d1084fbbf4b.tar.xz | |
Fix: [MINGW32] Fix launch on Windows 7 x64
Prior to this commit, the following is observed when running openttd.exe
that was compiled using mingw32 on x86_64:
> The procedure entry point ScriptBreak could not be located in the
dynamic link library GDI32.dll
The MSDN docs at the below link state that modules using Uniscribe must
first link against usp10 before gdi32 to avoid this issue:
https://msdn.microsoft.com/en-us/library/windows/desktop/dd319118(v=vs.85).aspx
Signed-off-by: Joe Stringer <joe@wand.net.nz>
| -rw-r--r-- | config.lib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.lib b/config.lib index 76cd37fde..dbee01220 100644 --- a/config.lib +++ b/config.lib @@ -1562,7 +1562,7 @@ make_cflags_and_ldflags() { LDFLAGS="$LDFLAGS -Wl,--subsystem,windows" fi - LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32" + LIBS="$LIBS -lws2_32 -lwinmm -lusp10 -lgdi32 -ldxguid -lole32 -limm32" if [ $cc_version -ge 404 ]; then LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++" |