cpp/openttd-patchpack/source Changeset - r5503:e3b65edce95d

Changeset - r5503:e3b65edce95d

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 18 years ago 2007-01-03 13:55:25
rubidium@openttd.org

(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.

2 files changed with 3 insertions and 3 deletions:

config.lib

src/strgen/strgen.c

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -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

src/strgen/strgen.c

➞

Show inline comments

@@ @@ -1271,7 +1271,7 @@ static inline char *mkpath(char *buf, si @@
 	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 /

0 comments (0 inline, 0 general)