Changeset 20958

Show
Ignore:
Timestamp:
11/28/07 22:05:53 (10 months ago)
Author:
patrick
Message:

Fixed linker errors when building with X11 as the windowing system on
Mac OS X 10.5.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/vrjuggler/configure.ac

    r20925 r20958  
    559559 
    560560        if test "x$VRJ_USE_X11" = "xyes" ; then 
     561            # Deal with a bug in Mac OS X 10.5.0 and 10.5.1 (at lesat) when 
     562            # linking against the X11 libGL.dylib. 
     563            case $target_os in 
     564               darwin9*) 
     565                  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' 
     566                  ;; 
     567            esac 
     568 
    561569            CFLAGS="$CFLAGS $X_CFLAGS" 
    562570            CXXFLAGS="$CXXFLAGS $X_CFLAGS" 
    563             DYLIB_DEPS_GL="$DYLIB_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks" 
    564             DYLIB_PROF_DEPS_GL="$DYLIB_PROF_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks" 
     571            DYLIB_DEPS_GL="$DYLIB_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks $gl_hack" 
     572            DYLIB_PROF_DEPS_GL="$DYLIB_PROF_DEPS_GL -lGLU -lGL $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $osx_gl_frameworks $gl_hack" 
    565573        else 
    566574            DYLIB_DEPS_GL="$DYLIB_DEPS_GL $OGL_LDFLAGS $LIBOPENGL $osx_gl_frameworks" 
    …… 
    581589        if test "x$PLATFORM" = "xDarwin" ; then 
    582590            if test "x$VRJ_USE_X11" = "xyes" ; then 
    583                 APP_EXTRA_LIBS_GL="-lGLU -lGL $osx_core_frameworks" 
     591                APP_EXTRA_LIBS_GL="-lGLU -lGL $osx_core_frameworks $gl_hack" 
    584592            else 
    585593                APP_EXTRA_LIBS_GL="$OGL_LDFLAGS $osx_core_frameworks"