pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed building with cygwin

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401367
This commit is contained in:
Sam Lantinga 2006-02-16 20:17:43 +00:00
parent 252c558b60
commit e0db705f31
1 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
configure.in
View file

@ -49,6 +49,20 @@ else
AC_DEFINE(SDL_BYTEORDER, 1234) AC_DEFINE(SDL_BYTEORDER, 1234)
fi fi
dnl Set up the base CFLAGS and LIBS
case "$target" in
*-*-cygwin*)
# We build SDL on cygwin without the UNIX emulation layer
BASE_CFLAGS="-I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
BASE_LIBS="-mno-cygwin"
;;
*)
BASE_CFLAGS="-D_GNU_SOURCE=1"
BASE_LIBS=""
;;
esac
CFLAGS="$CFLAGS $BASE_CFLAGS"
dnl Check for tools dnl Check for tools
#AC_LIBTOOL_DLOPEN #AC_LIBTOOL_DLOPEN
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
@ -144,7 +158,7 @@ INCLUDE="-I$srcdir/include"
if test x$srcdir != x.; then if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE" INCLUDE="-Iinclude $INCLUDE"
fi fi
BUILD_CFLAGS='-D_GNU_SOURCE=1 $(INCLUDE)' BUILD_CFLAGS="$BASE_CFLAGS \$(INCLUDE)"
# Standard C sources # Standard C sources
SOURCES="$SOURCES $srcdir/src/*.c" SOURCES="$SOURCES $srcdir/src/*.c"
@ -160,15 +174,13 @@ SOURCES="$SOURCES $srcdir/src/timer/*.c"
SOURCES="$SOURCES $srcdir/src/video/*.c" SOURCES="$SOURCES $srcdir/src/video/*.c"
# Set up the build libraries needed # Set up the build libraries needed
BUILD_LIBS="" BUILD_LIBS="$BASE_LIBS"
dnl Initialize the compiler and linker flags for SDL applications # Set up the compiler and linker flags for SDL applications
SDL_CFLAGS="$BASE_CFLAGS"
SDL_CFLAGS="" SDL_LIBS="$BASE_LIBS -lSDL"
SDL_LIBS="-lSDL"
dnl Add the math library for the new gamma correction support dnl Add the math library for the new gamma correction support
case "$target" in case "$target" in
*-*-cygwin* | *-*-mingw32*) *-*-cygwin* | *-*-mingw32*)
MATHLIB="" MATHLIB=""
@ -2123,18 +2135,8 @@ case "$target" in
fi fi
# The Win32 platform requires special setup # The Win32 platform requires special setup
SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
case "$target" in
*-*-cygwin*)
BUILD_CFLAGS="$BUILD_CFLAGS -I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
SDL_CFLAGS="$SDL_CFLAGS -I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
BUILD_LIBS="$BUILD_LIBS -mno-cygwin"
SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows -mno-cygwin"
;;
*-*-mingw32*)
SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows" SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
;; ;;
esac
;;
*-*-beos*) *-*-beos*)
ARCH=beos ARCH=beos
ac_default_prefix=/boot/develop/tools/gnupro ac_default_prefix=/boot/develop/tools/gnupro