From 0105aac04b2331202d021d2b69817a6623b33769 Mon Sep 17 00:00:00 2001 From: glx Date: Wed, 7 Mar 2007 16:46:13 +0000 Subject: (svn r9053) -Change [Config]: removed unneeded stuff for windows --- config.lib | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'config.lib') 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 -- cgit v1.2.3-54-g00ecf