summaryrefslogtreecommitdiff
path: root/config.lib
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-01-03 13:55:25 +0000
committerrubidium <rubidium@openttd.org>2007-01-03 13:55:25 +0000
commit21a1aa7c2c9aca67d15f8e3d92fc8044ba3190d0 (patch)
tree1f961faad6bc554fc089244b0b5cd957f1363c64 /config.lib
parent8cb56a9af6cee1f3ea09c8cf2e815d2c127c3d5e (diff)
downloadopenttd-21a1aa7c2c9aca67d15f8e3d92fc8044ba3190d0.tar.xz
(svn r7796) -Fix (r7759): cygwin does not need to rewrite the paths for strgen.
-Fix (r7759): supply the correct flags to cygwin to make it compile. Note: cygwin itself is 'broken'. Known issues with cygwin are: - bash does not work when including files that have dos line ending (\r\n). This causes the strange errors in config.lib. The solution is running: dos2unix config.lib - the windows-native svn does not work (though it previously did). The solution for this is to install the cygwin svn. - libfreetype2's freetype-config --cflags does not have ft2build.h in the path include search path. The workaround for this is to copy /usr/include/ft2build.h to /usr/include/freetype2/. Also linking does not work for static builds as freetype-config does not support that. You have to add the '--disable-static' flag when running './configure'. - libpng12 does not work with static building either. You have to add the '--disable-static' flag when running './configure' too.
Diffstat (limited to 'config.lib')
-rw-r--r--config.lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.lib b/config.lib
index 72ba1ad56..2f07b8736 100644
--- a/config.lib
+++ b/config.lib
@@ -933,7 +933,7 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS -mwin32"
LDFLAGS="$LDFLAGS -mwin32"
fi
- if [ "$os" = "MINGW" ]
+ if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]
then
CFLAGS="$CFLAGS -mno-cygwin"
LDFLAGS="$LDFLAGS -mno-cygwin"
@@ -951,7 +951,7 @@ make_cflags_and_ldflags() {
LIBS="$LIBS -lrt"
fi
- if [ "$os" != "MINGW" ]
+ if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ]
then
LIBS="$LIBS -lc"
fi