if test "$CXX" = "CC"; then
AR="CC -ar"
ARFLAGS="-o"
- CXXFLAGS="$CXXFLAGS -I$with_simgear/include/simgear/compatibility"
+ CXXFLAGS="$CXXFLAGS -c99 -I$with_simgear/include/simgear/compatibility"
+ CFLAGS="$CFLAGS -c99"
else
AR="ar"
ARFLAGS="cru"
dnl Used by JSBSim to conditionally compile in fgfs interface code
AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
-dnl Used to control whether clouds3d should be compiled in or not
-AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support])
-AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x" = "x")
-
# Check for MS Windows environment
AC_CHECK_HEADER(windows.h)
AC_SEARCH_LIBS(hid_init, usbhid)
joystick_LIBS="$LIBS"
LIBS=""
-AC_SUBST(joystick_LIBS)
dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of
fi
LIBS="$LIBS -lglu32 -lopengl32 -luser32 -lgdi32"
+ joystick_LIBS="$joystick_LIBS -lwinmm"
dnl add -lwsock32 for mingwin
case "${host}" in
dnl Mac OS X
LIBS="$LIBS -framework GLUT -framework OpenGL -framework AGL -framework Carbon -lobjc"
+ joystick_LIBS="$joystick_LIBS -framework IOKit -framework CoreFoundation"
;;
*)
AC_SEARCH_LIBS(alGenBuffers, openal32)
AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
- LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+ LIBS="$LIBS -ldsound -ldxguid -lole32"
openal_LIBS="$LIBS"
;;
AC_SUBST(opengl_LIBS)
AC_SUBST(thread_LIBS)
AC_SUBST(network_LIBS)
+AC_SUBST(joystick_LIBS)
# The following are C++ items that need to be tested for with the c++
# compiler
src/Traffic/Makefile \
tests/Makefile \
utils/Makefile \
- utils/TerraSync/Makefile \
- utils/Modeller/Makefile \
+ utils/GPSsmooth/Makefile \
utils/js_server/Makefile \
+ utils/Modeller/Makefile \
+ utils/TerraSync/Makefile \
])
AC_OUTPUT