Mercurial > sdl-ios-xcode

comparison configure.in @ 1624:8208ae96bb2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug #192 The change made to sdl-config.in on March 18 (rev 11, see http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/sdl-config.in), broke static linking under Mac OS X for unix style build systems. In other words, "sdl-config --static-libs" no longer produces the correct output, as it is missing the required -framework switches. The attached patch fixes this.
author Sam Lantinga <slouken@libsdl.org>
date Thu, 13 Apr 2006 13:29:00 +0000
parents f12379c41042
children 7e89aa7843c5
comparison
equal deleted inserted replaced
1623:09375aed0208 1624:8208ae96bb2d
2313 *-*-darwin* ) 2313 *-*-darwin* )
2314 # This could be either full "Mac OS X", or plain "Darwin" which is 2314 # This could be either full "Mac OS X", or plain "Darwin" which is
2315 # just the OS X kernel sans upper layers like Carbon and Cocoa. 2315 # just the OS X kernel sans upper layers like Carbon and Cocoa.
2316 # Next line is broken, and a few files below require Mac OS X (full) 2316 # Next line is broken, and a few files below require Mac OS X (full)
2317 ARCH=macosx 2317 ARCH=macosx
2318
2319 # HACK: Reset EXTRA_LDFLAGS; the only thing it contains at this point is
2320 # -lm which is not needed under Mac OS X. But for some reasons it also
2321 # tends to contain spurious -L switches, which we don't want to use
2322 # here or in sdl-config. Hence we reset it.
2323 EXTRA_LDFLAGS=""
2324
2318 CheckDummyVideo 2325 CheckDummyVideo
2319 CheckDiskAudio 2326 CheckDiskAudio
2320 CheckDummyAudio 2327 CheckDummyAudio
2321 CheckDLOPEN 2328 CheckDLOPEN
2322 CheckCOCOA 2329 CheckCOCOA
2526 fi 2533 fi
2527 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 2534 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
2528 SDL_LIBS="$SDL_LIBS -Wl,-framework,OpenGL" 2535 SDL_LIBS="$SDL_LIBS -Wl,-framework,OpenGL"
2529 fi 2536 fi
2530 # Evil hack to allow static linking on Mac OS X 2537 # Evil hack to allow static linking on Mac OS X
2531 SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a" 2538 SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
2532 ;; 2539 ;;
2533 *) 2540 *)
2534 SDL_STATIC_LIBS="$SDL_LIBS" 2541 SDL_STATIC_LIBS="$SDL_LIBS"
2535 ;; 2542 ;;
2536 esac 2543 esac