From fdc70f5584ebb70e29226f53721f26d541779d2a Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 18 Nov 2003 01:08:07 +0000 Subject: [PATCH] added option to disable kalinix under unix --- ChangeLog | 3 +++ arch/linux/Makefile.am | 7 +++++-- arch/linux/linuxnet.c | 6 +++++- configure.ac | 9 ++++++++- main/menu.c | 6 +++--- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 625353c9..65366bd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-11-17 Bradley Bell + * configure.ac, arch/linux/Makefile.am, arch/linux/linuxnet.c, + main/menu.c: added option to disable kalinix under unix + * main/game.c, main/newmenu.c: always set menu mode for GL popups 2003-11-14 Bradley Bell diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am index f35cca3a..381e17a8 100644 --- a/arch/linux/Makefile.am +++ b/arch/linux/Makefile.am @@ -5,17 +5,20 @@ noinst_LIBRARIES = libarch_linux.a INCLUDES = -I$(top_srcdir)/arch/include -I$(top_srcdir)/include -I$(top_srcdir)/main -I$(srcdir)/include if USE_NETWORK -NETWORK_SRCS = ipx_kali.c ipx_udp.c linuxnet.c ukali.c ipx_mcast4.c +NETWORK_SRCS = ipx_mcast4.c ipx_udp.c linuxnet.c if USE_NATIVE_IPX IPX_SRCS = ipx_bsd.c endif +if USE_KALINIX +KALI_SRCS = ipx_kali.c ukali.c +endif endif if USE_LINUX_JOY JOYSTICK_SRCS = joystick.c joydefs.c endif -libarch_linux_a_SOURCES = ${NETWORK_SRCS} ${IPX_SRCS} ${JOYSTICK_SRCS} findfile.c init.c +libarch_linux_a_SOURCES = ${NETWORK_SRCS} ${IPX_SRCS} ${KALI_SRCS} ${JOYSTICK_SRCS} findfile.c init.c EXTRA_libarch_linux_a_SOURCES = \ ipx_bsd.c ipx_kali.c ipx_mcast4.c ipx_udp.c linuxnet.c ukali.c \ diff --git a/arch/linux/linuxnet.c b/arch/linux/linuxnet.c index ace971aa..30639e48 100644 --- a/arch/linux/linuxnet.c +++ b/arch/linux/linuxnet.c @@ -1,4 +1,4 @@ -/* $Id: linuxnet.c,v 1.12 2003-10-12 09:17:47 btb Exp $ */ +/* $Id: linuxnet.c,v 1.13 2003-11-18 01:08:07 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -41,7 +41,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef NATIVE_IPX # include "ipx_bsd.h" #endif //NATIVE_IPX +#ifdef KALINIX #include "ipx_kali.h" +#endif #include "ipx_udp.h" #include "ipx_mcast4.h" #include "error.h" @@ -108,7 +110,9 @@ void arch_ipx_set_driver(int ipx_driver) #ifdef NATIVE_IPX case IPX_DRIVER_IPX: driver = &ipx_bsd; break; #endif //NATIVE_IPX +#ifdef KALINIX case IPX_DRIVER_KALI: driver = &ipx_kali; break; +#endif case IPX_DRIVER_UDP: driver = &ipx_udp; break; case IPX_DRIVER_MCAST4: driver = &ipx_mcast4; break; default: Int3(); diff --git a/configure.ac b/configure.ac index 787ac53c..3234ac10 100644 --- a/configure.ac +++ b/configure.ac @@ -277,7 +277,7 @@ if test x$enable_network != xno; then enable_native_ipx="yes"; ;; *) - AC_MSG_WARN([d2x doesn't support native ipx on this host. disabling native ipx]) + AC_MSG_WARN([d2x does not support native ipx on this host. disabling native ipx]) enable_native_ipx="no"; ;; esac @@ -290,16 +290,23 @@ if test x$enable_network != xno; then ;; esac fi +AC_ARG_ENABLE(kalinix, + [ --disable-kalinix Disable the KaliNix driver (unix-only)],,) if test x$enable_network != xno; then if test x$enable_native_ipx != xno; then D2X_FEATURES="ipx ${D2X_FEATURES}" AC_DEFINE(NATIVE_IPX,,[Define to use the IPX support of the OS]) fi + if test x$enable_kalinix != xno; then + D2X_FEATURES="kalinix ${D2X_FEATURES}" + AC_DEFINE(KALINIX,,[Define to enable use of the KaliNix driver]) + fi AC_DEFINE(NETWORK,,[Define if you want a network build]) D2X_FEATURES="network ${D2X_FEATURES}" fi AM_CONDITIONAL(USE_NETWORK, test x$enable_network != xno) AM_CONDITIONAL(USE_NATIVE_IPX, test x$enable_native_ipx != xno) +AM_CONDITIONAL(USE_KALINIX, test x$enable_kalinix != xno) dnl Check for assembler AC_ARG_ENABLE(assembler, diff --git a/main/menu.c b/main/menu.c index e96d9a20..a0084e92 100644 --- a/main/menu.c +++ b/main/menu.c @@ -1,4 +1,4 @@ -/* $Id: menu.c,v 1.33 2003-11-14 23:14:02 btb Exp $ */ +/* $Id: menu.c,v 1.34 2003-11-18 01:08:07 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1732,10 +1732,10 @@ void do_multi_player_menu() ADD_ITEM("Join UDP/IP Netgame\n", MENU_JOIN_UDP_NETGAME, -1); ADD_ITEM("Start Multicast UDP/IP Netgame", MENU_START_MCAST4_NETGAME, -1); ADD_ITEM("Join Multicast UDP/IP Netgame\n", MENU_JOIN_MCAST4_NETGAME, -1); -#ifdef __unix__ +#ifdef KALINIX ADD_ITEM("Start Kali Netgame", MENU_START_KALI_NETGAME, -1); ADD_ITEM("Join Kali Netgame\n", MENU_JOIN_KALI_NETGAME, -1); -#endif //__unix__ +#endif // KALINIX #ifdef MACINTOSH ADD_ITEM("Start Appletalk Netgame", MENU_START_APPLETALK_NETGAME, -1 ); -- 2.39.2