Changeset - r23858:9145e5e40bf5
[Not reviewed]
master
0 1 0
Joe Stringer - 5 years ago 2019-10-06 01:37:45
joe@wand.net.nz
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>
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -1559,13 +1559,13 @@ make_cflags_and_ldflags() {
 
			if [ "$enable_console" != "0" ]; then
 
				LDFLAGS="$LDFLAGS -Wl,--subsystem,console"
 
			else
 
				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++"
 
			fi
 
			if [ $cc_version -ge 407 ]; then
 
				CFLAGS="$CFLAGS -mno-ms-bitfields"
0 comments (0 inline, 0 general)