Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r7796) -Fix (r7759): cygwin does not need to rewrite the paths for strgen.

Browse Source 
-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.
This commit is contained in:
rubidium 2007-01-03 13:55:25 +00:00
parent 8cb56a9af6
commit 21a1aa7c2c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.lib
View File

@ -933,7 +933,7 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS -mwin32" CFLAGS="$CFLAGS -mwin32"
LDFLAGS="$LDFLAGS -mwin32" LDFLAGS="$LDFLAGS -mwin32"
fi fi
if [ "$os" = "MINGW" ] if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]
then then
CFLAGS="$CFLAGS -mno-cygwin" CFLAGS="$CFLAGS -mno-cygwin"
LDFLAGS="$LDFLAGS -mno-cygwin" LDFLAGS="$LDFLAGS -mno-cygwin"
@ -951,7 +951,7 @@ make_cflags_and_ldflags() {
LIBS="$LIBS -lrt" LIBS="$LIBS -lrt"
fi fi
if [ "$os" != "MINGW" ] if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ]
then then
LIBS="$LIBS -lc" LIBS="$LIBS -lc"
fi fi

2
src/strgen/strgen.c
View File

@ -1271,7 +1271,7 @@ static inline char *mkpath(char *buf, size_t buflen, const char *path, const cha
return buf; return buf;
} }
#if defined(__MINGW32__) || defined(__CYGWIN__) #if defined(__MINGW32__)
/** /**
* On MingW, it is common that both / as \ are accepted in the * On MingW, it is common that both / as \ are accepted in the
* params. To go with those flow, we rewrite all incoming / * params. To go with those flow, we rewrite all incoming /