configure.in
branchSDL-1.2
changeset 6130 987c365cc7bf
parent 6112 60dfd25009b0
child 6143 29811864f4cf
     1.1 --- a/configure.in	Fri Dec 30 06:54:58 2011 -0500
     1.2 +++ b/configure.in	Fri Dec 30 14:14:45 2011 -0500
     1.3 @@ -1556,6 +1556,7 @@
     1.4              AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA)
     1.5              SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
     1.6              SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
     1.7 +            SDLMAIN_LDFLAGS="-static"
     1.8              EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS"
     1.9              SDL_CFLAGS="$SDL_CFLAGS -DQWS -Dmain=SDL_main"
    1.10              SDL_LIBS="-lSDLmain $SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte"
    1.11 @@ -2548,8 +2549,9 @@
    1.12          # The Win32 platform requires special setup
    1.13          SOURCES="$SOURCES $srcdir/src/main/win32/*.rc"
    1.14          SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
    1.15 +        SDLMAIN_LDFLAGS="-static"
    1.16          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
    1.17 -        SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
    1.18 +        SDL_LIBS="-lSDLmain $SDL_LIBS -mwindows"
    1.19          ;;
    1.20      *-wince*)
    1.21          ARCH=win32
    1.22 @@ -2591,6 +2593,7 @@
    1.23          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lcoredll -lcommctrl"
    1.24          # The Win32 platform requires special setup
    1.25          SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
    1.26 +        SDLMAIN_LDFLAGS="-static"
    1.27          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
    1.28          SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.29          ;;
    1.30 @@ -2722,6 +2725,7 @@
    1.31          fi
    1.32          # The Mac OS X platform requires special setup.
    1.33          SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
    1.34 +        SDLMAIN_LDFLAGS="-static"
    1.35          EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
    1.36          SDL_LIBS="-lSDLmain $SDL_LIBS"
    1.37          if test x$enable_video_cocoa = xyes; then
    1.38 @@ -2858,6 +2862,7 @@
    1.39  fi
    1.40  if test x$SDLMAIN_SOURCES = x; then
    1.41      SDLMAIN_SOURCES="$srcdir/src/main/dummy/*.c"
    1.42 +    SDLMAIN_LDFLAGS="-static"
    1.43  fi
    1.44  
    1.45  OBJECTS=`echo $SOURCES | sed 's,[[^ ]]*/\([[^ ]]*\)\.asm,$(objects)/\1.lo,g'`
    1.46 @@ -2865,11 +2870,11 @@
    1.47  OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.m,$(objects)/\1.lo,g'`
    1.48  OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
    1.49  OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.S,$(objects)/\1.lo,g'`
    1.50 -OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
    1.51 +OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
    1.52  
    1.53 -SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES | sed 's,[[^ ]]*/\([[^ ]]*\)\.cc,$(objects)/\1.o,g'`
    1.54 -SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.m,$(objects)/\1.o,g'`
    1.55 -SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
    1.56 +SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES | sed 's,[[^ ]]*/\([[^ ]]*\)\.cc,$(objects)/\1.lo,g'`
    1.57 +SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.m,$(objects)/\1.lo,g'`
    1.58 +SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
    1.59  
    1.60  # Set runtime shared library paths as needed
    1.61  
    1.62 @@ -2931,6 +2936,7 @@
    1.63  AC_SUBST(OBJECTS)
    1.64  AC_SUBST(SDLMAIN_SOURCES)
    1.65  AC_SUBST(SDLMAIN_OBJECTS)
    1.66 +AC_SUBST(SDLMAIN_LDFLAGS)
    1.67  AC_SUBST(BUILD_CFLAGS)
    1.68  AC_SUBST(EXTRA_CFLAGS)
    1.69  AC_SUBST(BUILD_LDFLAGS)