AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
fi
-# Specify if we want to build with Oliver's networking support
+# Specify if we want to build with Multiplayer support
# default to with_network=yes
-AC_ARG_WITH(network_olk, [ --with-network-olk Include Oliver's multi-pilot networking support])
-if test "x$with_network_olk" = "xno" ; then
- echo "Building without Oliver's multi-pilot network support"
+AC_ARG_WITH(multiplayer, [ --with-multiplayer Include default multiplayer support])
+AC_ARG_WITH(network_olk, [ --with-network-olk Include Oliver's multi-pilot networking support [default=no]])
+
+if test "x$with_multiplayer" = "xno" -a "x$with_network_olk" = "xno"; then
+ echo "Building without any kind of multiplayer support"
+
+elif test "x$with_multiplayer" = "xno"; then
+# echo "Building without default multiplayer support"
+ echo "Building with Oliver's multi-pilot network support"
+ AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking])
+
else
- echo "Building with Oliver's multi-pilot network support"
- AC_DEFINE([FG_NETWORK_OLK], 1, [Define to build with Oliver's networking])
+ echo "Building with default multiplayer support"
+# echo "Building without Oliver's multi-pilot network support"
+ AC_DEFINE([FG_MPLAYER_AS], 1, [Define to build with default multiplayer support])
fi
-AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno")
+
+AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno" -a "x$with_multiplayer" = "xno")
+AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
# Specify if we want to use WeatherCM instead of FGEnvironment.
fi
AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
-dnl Specify if we want the old menubar; default to the new one
-AC_ARG_WITH(old-menubar, [ --with-old-menubar Use the old menu bar])
-if test "x$with_old_menubar" = "xyes" ; then
- echo "Building with old menubar"
- AC_DEFINE([FG_OLD_MENUBAR], 1,
- [Define to build with old menubar])
-else
- echo "Building with new menubar"
-fi
-AM_CONDITIONAL(ENABLE_WEATHERCM, test "x$with_weathercm" = "xyes")
-
dnl Thread related checks
AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=no]])
if test "x$with_threads" = "xyes"; then
*-*-cygwin* | *-*-mingw32*)
audio_LIBS="$audio_LIBS -lwinmm"
;;
-
+*-apple-darwin*)
+ audio_LIBS="$audio_LIBS -framework IOKit -framework CoreFoundation"
+ ;;
*-*-irix* )
audio_LIBS="$audio_LIBS -laudio"
;;
else
AC_CHECK_HEADER(GLUT/glut.h)
if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
- AC_DEFINE([GLUT_H], "GLUT/glut.h", [Define as glut.h include location])
+ AC_DEFINE([GLUT_H], <GLUT/glut.h>, [Define as glut.h include location])
else
echo "Neither GL/glut.h nor GLUT/glut.h found. Cannot continue"
exit
src/Environment/Makefile \
src/FDM/Balloon/Makefile \
src/FDM/ExternalNet/Makefile \
+ src/FDM/ExternalPipe/Makefile \
src/FDM/JSBSim/Makefile \
src/FDM/JSBSim/filtersjb/Makefile \
src/FDM/LaRCsim/Makefile \
src/Main/runfgfs \
src/Main/runfgfs.bat \
src/Model/Makefile \
+ src/MultiPlayer/Makefile \
src/Navaids/Makefile \
src/Network/Makefile \
src/NetworkOLK/Makefile \
echo "Using FGEnvironment"
fi
-if test "x$with_old_menubar" != "x"; then
- echo "Using old menubar"
-else
- echo "Defaulting to new XML-configurable menubar"
+if test "x$with_multiplayer" != "xno"; then
+ echo "Using default multiplayer support"
+elif test "x$with_network_olk" != "xno"; then
+ echo "Using Oliver's multi-pilot network support"
fi
if test "x$with_threads" = "xyes"; then