Navigation

Changeset 20959

Timestamp:

11/28/07 22:07:40 (9 months ago)

Author:

patrick

Message:

MFT r20958: Fixed linker errors when building with X11 as the windowing

system on Mac OS X 10.5.

Files:

r20783	r20959
464	464
465	465	if test "x$VRJ_USE_X11" = "xyes" ; then
	466	# Deal with a bug in Mac OS X 10.5.0 and 10.5.1 (at lesat) when
	467	# linking against the X11 libGL.dylib.
	468	case $target_os in
	469	darwin9*)
	470	gl_hack='-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib'
	471	;;
	472	esac
	473
466	474	CFLAGS="$CFLAGS $X_CFLAGS"
467	475	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
468		DYLIB_DEPS_GL="$DYLIB_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks"
469		DYLIB_PROF_DEPS_GL="$DYLIB_PROF_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks"
	476	DYLIB_DEPS_GL="$DYLIB_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks $gl_hack"
	477	DYLIB_PROF_DEPS_GL="$DYLIB_PROF_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks $gl_hack"
470	478	else
471	479	DYLIB_DEPS_GL="$DYLIB_DEPS_GL $OGL_LDFLAGS $LIBOPENGL $osx_gl_frameworks"
…	…
486	494	if test "x$PLATFORM" = "xDarwin" ; then
487	495	if test "x$VRJ_USE_X11" = "xyes" ; then
488		APP_EXTRA_LIBS_GL="-lGLU -lGL $osx_core_frameworks"
	496	APP_EXTRA_LIBS_GL="-lGLU -lGL $osx_core_frameworks $gl_hack"
489	497	else
490	498	APP_EXTRA_LIBS_GL="$OGL_LDFLAGS $osx_core_frameworks"