diff options
| author | glx <glx@openttd.org> | 2009-08-21 21:21:09 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2009-08-21 21:21:09 +0000 |
| commit | dd1a442aaa8452daa191bd3b76770428aa2d323a (patch) | |
| tree | d702ac068d0dd3d61bee6a8309e4c7e4b9d78bf1 /config.lib | |
| parent | 7fbc33dae1dc1f7886ad11074fc109d10d8867e0 (diff) | |
| download | openttd-dd1a442aaa8452daa191bd3b76770428aa2d323a.tar.xz | |
(svn r17249) -Fix: MinGW gcc 4.4.0 dynamically links with libgcc_s_dw2-1.dll by default. Prevent this so strgen.exe build with MinGW can be run on a system without MinGW installed. (Note: openttd.exe is not affected by this behaviour as -static is used by default for it)
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/config.lib b/config.lib index ee2579f3d..3ae524dfb 100644 --- a/config.lib +++ b/config.lib @@ -1102,6 +1102,8 @@ make_compiler_cflags() { make_cflags_and_ldflags() { # General CFlags for BUILD CFLAGS_BUILD="" + #LDFLAGS for BUILD + LDFLAGS_BUILD="" # General CFlags for HOST CFLAGS="$CFLAGS -D$os" # Libs to compile. In fact this is just LDFLAGS @@ -1162,12 +1164,12 @@ make_cflags_and_ldflags() { fi if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then flags="$flags -mno-cygwin" - LDFLAGS="$LDFLAGS -mno-cygwin" - fi - - if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then - LDFLAGS="$LDFLAGS -Wl,--subsystem,windows" + LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,windows" LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32" + + if [ $cc_version -ge 44 ]; then + LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc" + fi fi fi @@ -2648,6 +2650,7 @@ make_sed() { s@!!STRGEN_FLAGS!!@$strgen_flags@g; s@!!LIBS!!@$LIBS@g; s@!!LDFLAGS!!@$T_LDFLAGS@g; + s@!!LDFLAGS_BUILD!!@$LDFLAGS_BUILD@g; s@!!BIN_DIR!!@$BIN_DIR@g; s@!!ROOT_DIR!!@$ROOT_DIR@g; s@!!MEDIA_DIR!!@$MEDIA_DIR@g; |