FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added autoconf detection for the xf86 vid mode extentions.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@151 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
cjp 2003-08-01 20:40:08 +00:00
parent 3a3e68b87e
commit 9f3c1dcc82
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
freeglut/freeglut/configure.in
View File

@ -16,10 +16,19 @@ AC_SUBST(LIBTOOL_DEPS)
dnl Checks for libraries. dnl Checks for libraries.
AC_PATH_XTRA AC_PATH_XTRA
AC_CHECK_LIB(Xxf86vm,XF86VidModeSwitchToMode,
LIBXXF86VM=-lXxf86vm,LIBXXF86VM=,$X_LIBS -lXext -lX11)
AC_SUBST(LIBXXF86VM)
dnl Checks for header files. dnl Checks for header files.
AC_STDC_HEADERS AC_STDC_HEADERS
AC_HAVE_HEADERS( GL/gl.h GL/glu.h GL/glx.h ) AC_HAVE_HEADERS( GL/gl.h GL/glu.h GL/glx.h )
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
AC_CHECK_HEADERS( X11/extensions/xf86vmode.h )
CFLAGS="$save_CFLAGS"
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions. dnl Checks for library functions.

2
freeglut/freeglut/src/Makefile.am
View File

@ -35,7 +35,7 @@ libglut_la_SOURCES = freeglut_callbacks.c \
# #
# Additional linker flags # Additional linker flags
# #
libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 -lXxf86vm libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
libglut_la_LDFLAGS = -version-info 11:0:8 libglut_la_LDFLAGS = -version-info 11:0:8
# #

18
freeglut/freeglut/src/freeglut_glutfont_definitions.c
View File

@ -61,16 +61,16 @@ struct freeglutBitmapFont
} ; } ;
struct freeglutStrokeFont *glutStrokeRoman ; struct freeglutStrokeFont glutStrokeRoman ;
struct freeglutStrokeFont *glutStrokeMonoRoman ; struct freeglutStrokeFont glutStrokeMonoRoman ;
struct freeglutBitmapFont *glutBitmap9By15 ; struct freeglutBitmapFont glutBitmap9By15 ;
struct freeglutBitmapFont *glutBitmap8By13 ; struct freeglutBitmapFont glutBitmap8By13 ;
struct freeglutBitmapFont *glutBitmapTimesRoman10 ; struct freeglutBitmapFont glutBitmapTimesRoman10 ;
struct freeglutBitmapFont *glutBitmapTimesRoman24 ; struct freeglutBitmapFont glutBitmapTimesRoman24 ;
struct freeglutBitmapFont *glutBitmapHelvetica10 ; struct freeglutBitmapFont glutBitmapHelvetica10 ;
struct freeglutBitmapFont *glutBitmapHelvetica12 ; struct freeglutBitmapFont glutBitmapHelvetica12 ;
struct freeglutBitmapFont *glutBitmapHelvetica18 ; struct freeglutBitmapFont glutBitmapHelvetica18 ;
#endif #endif

4
freeglut/freeglut/src/freeglut_internal.h
View File

@ -89,11 +89,9 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#ifndef __sgi #if HAVE_X11_EXTENSIONS_XF86VMODE_H
#ifndef SOLARIS
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
#endif #endif
#endif
#endif #endif
/* /*