changeset 5503:02cd53f53180 draft

(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.
author rubidium <rubidium@openttd.org>
date Wed, 03 Jan 2007 13:55:25 +0000
parents b500113fc5b1
children 8a167f123c20
files config.lib src/strgen/strgen.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/config.lib
+++ b/config.lib
@@ -933,7 +933,7 @@
 		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 @@
 		LIBS="$LIBS -lrt"
 	fi
 
-	if [ "$os" != "MINGW" ]
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ]
 	then
 		LIBS="$LIBS -lc"
 	fi
--- a/src/strgen/strgen.c
+++ b/src/strgen/strgen.c
@@ -1271,7 +1271,7 @@
 	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 /