diff options
| author | rubidium <rubidium@openttd.org> | 2007-01-03 13:55:25 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-01-03 13:55:25 +0000 |
| commit | 20f12958d533727e6c7887441f85432ce7ae0047 (patch) | |
| tree | 1f961faad6bc554fc089244b0b5cd957f1363c64 | |
| parent | 969194629e44ce9e4678ec255655e64d806e560a (diff) | |
| download | openttd-20f12958d533727e6c7887441f85432ce7ae0047.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.
| -rw-r--r-- | config.lib | 4 | ||||
| -rw-r--r-- | src/strgen/strgen.c | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/src/strgen/strgen.c b/src/strgen/strgen.c index 1726750f5..640ac3c63 100644 --- a/src/strgen/strgen.c +++ b/src/strgen/strgen.c @@ -1271,7 +1271,7 @@ static inline char *mkpath(char *buf, size_t buflen, const char *path, const cha return buf; } -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) /** * On MingW, it is common that both / as \ are accepted in the * params. To go with those flow, we rewrite all incoming / |