updated autotools support for make, while keeping jam support. other options are cmake and msvc builds.
This commit is contained in:
40
configure.ac
40
configure.ac
@@ -80,7 +80,42 @@ AS_IF([test $cs_host_family = windows],
|
||||
CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$glut_cflags], [+])
|
||||
CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [$glut_lflags], [+])
|
||||
])
|
||||
CS_CHECK_GLUT
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# check for OpenGL related libraries
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
case "${host}" in
|
||||
*darwin*|*macosx*)
|
||||
opengl_LIBS="$LIBS -framework Carbon -framework OpenGL -framework IOKit -framework AGL"
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32*)
|
||||
dnl CygWin under Windoze.
|
||||
|
||||
echo Win32 specific hacks...
|
||||
AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
|
||||
AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
|
||||
|
||||
opengl_LIBS="-lglut32 -lglu32 -lopengl32 -luser32 -lgdi32 -lm -lwinmm"
|
||||
joystick_LIBS="$joystick_LIBS -lwinmm"
|
||||
|
||||
echo "Will link apps with $LIBS"
|
||||
;;
|
||||
*)
|
||||
dnl X-Windows based machines
|
||||
|
||||
save_LIBS=$LIBS
|
||||
AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ])
|
||||
AC_SEARCH_LIBS(glutInit, [ glut ])
|
||||
opengl_LIBS="$LIBS"
|
||||
LIBS=$save_LIBS
|
||||
if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then
|
||||
dnl if GLcore found, then also check for GL
|
||||
AC_SEARCH_LIBS(glXCreateContext, GL)
|
||||
fi
|
||||
AC_SUBST(opengl_LIBS,[$opengl_LIBS])
|
||||
esac
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Package configuration switches.
|
||||
@@ -106,7 +141,8 @@ CS_EMIT_PACKAGEINFO
|
||||
# Emit generated files.
|
||||
#----------------------------------------------------------------------------
|
||||
CS_JAMCONFIG_OUTPUT([Jamconfig])
|
||||
AC_CONFIG_FILES([Jamfile bullet.pc Makefile src/Makefile Demos/OpenGL/Makefile])
|
||||
AC_CONFIG_FILES([Jamfile bullet.pc Makefile src/Makefile Demos/OpenGL/Makefile Demos/BasicDemo/Makefile Demos/VehicleDemo/Makefile Demos/CcdPhysicsDemo/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
AC_MSG_NOTICE([
|
||||
|
||||
Reference in New Issue
Block a user