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

Implementing a patch from Jocelyn Frechot (thank you, Jocelyn) that "should enable the XInput extension management with the autotools." See e-mail of Sun 7/20/2008 12:01 PM.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@742 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2008-07-21 15:00:51 +00:00
parent a3f35083ec
commit ebaedf2da0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freeglut/freeglut/configure.ac
View File

@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT([freeglut library], [2.4.0], [freeglut-bugs@lists.sourceforge.net], [freeglut]) AC_INIT([freeglut library], [2.6.0], [freeglut-bugs@lists.sourceforge.net], [freeglut])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_PREREQ([2.56]) AC_PREREQ([2.56])
AC_CONFIG_SRCDIR([AUTHORS]) AC_CONFIG_SRCDIR([AUTHORS])
@ -23,6 +23,7 @@ AC_PATH_XTRA
if test x"$no_x" = xyes; then if test x"$no_x" = xyes; then
GL_LIBS="-lopengl32 -lglu32 -lgdi32" GL_LIBS="-lopengl32 -lglu32 -lgdi32"
LIBXXF86VM= LIBXXF86VM=
LIBXI=
VERSION_INFO= VERSION_INFO=
EXPORT_FLAGS="-DFREEGLUT_EXPORTS" EXPORT_FLAGS="-DFREEGLUT_EXPORTS"
else else
@ -30,11 +31,13 @@ else
AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode], AC_CHECK_LIB([Xxf86vm], [XF86VidModeSwitchToMode],
[LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=], [LIBXXF86VM=-lXxf86vm], [LIBXXF86VM=],
[$X_LIBS -lXext -lX11]) [$X_LIBS -lXext -lX11])
LIBXI=-lXi
VERSION_INFO="-version-info 11:0:8" VERSION_INFO="-version-info 11:0:8"
EXPORT_FLAGS= EXPORT_FLAGS=
fi fi
AC_SUBST([GL_LIBS]) AC_SUBST([GL_LIBS])
AC_SUBST([LIBXXF86VM]) AC_SUBST([LIBXXF86VM])
AC_SUBST([LIBXI])
AC_SUBST([VERSION_INFO]) AC_SUBST([VERSION_INFO])
AC_SUBST([EXPORT_FLAGS]) AC_SUBST([EXPORT_FLAGS])
@ -45,6 +48,7 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h]) AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
AC_HEADER_TIME AC_HEADER_TIME
AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>]) AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
# Checks for library functions. # Checks for library functions.

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

@ -42,7 +42,7 @@ lib@LIBRARY@_la_SOURCES = freeglut_callbacks.c \
# #
# Additional linker flags # Additional linker flags
# #
lib@LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) $(GL_LIBS) $(LIBXXF86VM) lib@LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) $(GL_LIBS) $(LIBXXF86VM) $(LIBXI)
lib@LIBRARY@_la_LDFLAGS = $(VERSION_INFO) lib@LIBRARY@_la_LDFLAGS = $(VERSION_INFO)
lib@LIBRARY@_la_CFLAGS = $(X_CFLAGS) $(EXPORT_FLAGS) lib@LIBRARY@_la_CFLAGS = $(X_CFLAGS) $(EXPORT_FLAGS)
lib@LIBRARY@_la_CPPFLAGS= -I$(top_srcdir)/include lib@LIBRARY@_la_CPPFLAGS= -I$(top_srcdir)/include