summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-03-07 16:46:13 +0000
committerglx <glx@openttd.org>2007-03-07 16:46:13 +0000
commit1db73f1cda0364d708c0020051841dc09f7d1cb3 (patch)
tree049f9c7679050c582d86e421b9373ff9196f186c
parent979ccd45baa9a38169661ba379a341cae8619c3b (diff)
downloadopenttd-1db73f1cda0364d708c0020051841dc09f7d1cb3.tar.xz
(svn r9053) -Change [Config]: removed unneeded stuff for windows
-rw-r--r--config.lib16
1 files changed, 12 insertions, 4 deletions
diff --git a/config.lib b/config.lib
index 5eb89396e..d5ba6f4e4 100644
--- a/config.lib
+++ b/config.lib
@@ -749,10 +749,12 @@ make_cflags_and_ldflags() {
if [ -n "$sdl_config" ]; then
CFLAGS="$CFLAGS -DWITH_SDL"
CFLAGS="$CFLAGS `$sdl_config --cflags`"
- if [ "$enable_static" != "0" ]; then
- LIBS="$LIBS `$sdl_config --static-libs`"
- else
- LIBS="$LIBS `$sdl_config --libs`"
+ if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
+ if [ "$enable_static" != "0" ]; then
+ LIBS="$LIBS `$sdl_config --static-libs`"
+ else
+ LIBS="$LIBS `$sdl_config --libs`"
+ fi
fi
fi
@@ -1569,6 +1571,12 @@ detect_fontconfig() {
return 0
fi
+ if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
+ log 1 "checking libfontconfig... WIN32, skipping"
+ fontconfig_config=""
+ return 0
+ fi
+
if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then
fontconfig_config="pkg-config fontconfig"
else