Changeset 651 for abuseTweet

Timestamp:

May 14, 2011, 3:06:27 AM (12 years ago)

Author:

Sam Hocevar

Message:

build: add a --disable-network compilation flag and get rid of most of
the CELLOS_LV2 ifdefs.

Location:

abuse/trunk

Files:

• configure.ac (modified) (3 diffs)
• src/Makefile.am (modified) (1 diff)
• src/clisp.cpp (modified) (1 diff)
• src/game.cpp (modified) (19 diffs)
• src/innet.cpp (modified) (23 diffs)
• src/loader2.cpp (modified) (3 diffs)
• src/menu.cpp (modified) (1 diff)
• src/net/Makefile.am (modified) (2 diffs)
• src/net/engine.cpp (modified) (2 diffs)
• src/net/fileman.cpp (modified) (2 diffs)
• src/net/gclient.cpp (modified) (1 diff)
• src/net/gserver.cpp (modified) (1 diff)
• src/net/netdrv.cpp (modified) (2 diffs)
• src/net/netfile.cpp (modified) (3 diffs)
• src/net/sock.cpp (modified) (2 diffs)
• src/net/tcpip.cpp (modified) (2 diffs)
• src/net/undrv.cpp (modified) (2 diffs)
• src/netcfg.cpp (modified) (5 diffs)
• src/nfclient.cpp (modified) (14 diffs)
• src/nfserver.h (modified) (2 diffs)
• src/view.cpp (modified) (7 diffs)

abuse/trunk/configure.ac

@@ -21 +21 @@
 
 AC_ARG_ENABLE(debug,
-  [  --enable-debug          build debug versions of the game (default no)])
+  [  --enable-debug          build debug versions of the game (default disabled)])
 AC_ARG_ENABLE(release,
-  [  --enable-release        build final release of the game (default no)])
+  [  --enable-release        build final release of the game (default disabled)])
 AC_ARG_ENABLE(nonfree,
-  [  --disable-nonfree       disable non-free data (default no)])
+  [  --disable-nonfree       disable non-free data (default enabled)])
+AC_ARG_ENABLE(network,
+  [  --disable-network       disable networking (default enabled)])
 
 AC_ARG_WITH(assetdir,
@@ -86 +88 @@
   ac_cv_have_nonfree="yes"
 fi
-if test "${enable_nonfree}" = "no"; then
+if test "x${enable_nonfree}" = xno; then
   ac_cv_have_nonfree="no"
 fi
@@ -95 +97 @@
 fi
 AC_SUBST(distdir)
-AM_CONDITIONAL(HAVE_NONFREE, test "${ac_cv_have_nonfree}" = "yes")
+AM_CONDITIONAL(HAVE_NONFREE, test "x${ac_cv_have_nonfree}" = xyes)
+
+dnl  Is networking enabled?
+if test "x${enable_network}" != xno; then
+  AC_DEFINE(HAVE_NETWORK, 1, Define to 1 to enable networking)
+fi
+AM_CONDITIONAL(HAVE_NETWORK, test "x${enable_network}" != xno)
 
 # Optimizations

abuse/trunk/src/Makefile.am

@@ -75 +75 @@
 abuse_tool_DEPENDENCIES = $(abuse_tool_LDADD)
 
-INCLUDES = -I$(srcdir) -I $(srcdir)/lisp -I$(srcdir)/imlib \
+INCLUDES = -I$(srcdir) -I$(srcdir)/lisp -I$(srcdir)/imlib \
            -I$(srcdir)/net $(SDL_CFLAGS)
 
 CPPFLAGS = @CPPFLAGS@ -DNO_CHECK
+

abuse/trunk/src/clisp.cpp

@@ -2188 +2188 @@
     case 276 :
     {
-#if defined __CELLOS_LV2__
-      return 0;
-#else
       if (!main_net_cfg) return 0;
       return become_server(game_name);
-#endif
     } break;
     case 277 :

abuse/trunk/src/game.cpp

@@ -84 +84 @@
 extern uint8_t chatting_enabled;
 
-// Enabled TCPIP driver
-#if !defined __CELLOS_LV2__
+// Enable TCP/IP driver
+#if HAVE_NETWORK
 #include "tcpip.h"
 tcpip_protocol tcpip;
@@ -548 +548 @@
     }
 
-#if !defined __CELLOS_LV2__
     base->current_tick=(current_level->tick_counter()&0xff);
-#endif
 
     current_level->level_loaded_notify();
@@ -1389 +1387 @@
   calc_light_table(pal);
 
-#if !defined __CELLOS_LV2__
   if(current_level == NULL && net_start())  // if we joined a net game get level from server
   {
@@ -1399 +1396 @@
 //    load_level(NET_STARTFILE);
   }
-#endif
 
   set_mode(19, argc, argv);
@@ -1466 +1462 @@
   gamma_correct(pal);
 
-#if defined __CELLOS_LV2__
-  if(!start_edit)
-    do_title();
-#else
   if(main_net_cfg == NULL || (main_net_cfg->state != net_configuration::SERVER &&
                  main_net_cfg->state != net_configuration::CLIENT))
@@ -1480 +1472 @@
     start_running = 1;
   }
-#endif
 
 
@@ -1662 +1653 @@
         if(ev.type != EV_KEY || !key_down(ev.key) || ev.window || (dev & EDIT_MODE))
         {
-#if !defined __CELLOS_LV2__
             if(ev.type == EV_KEY)
             {
@@ -1700 +1690 @@
                 }
             }
-#endif
 
             if((dev & EDIT_MODE) || start_edit || ev.type == EV_MESSAGE)
@@ -1915 +1904 @@
 void net_send(int force = 0)
 {
-#if !defined __CELLOS_LV2__
   if((!(dev & EDIT_MODE)) || force)
   {
@@ -1950 +1938 @@
     }
   }
-#endif
 }
 
 void net_receive()
 {
-#if !defined __CELLOS_LV2__
   if(!(dev & EDIT_MODE) && current_level)
   {
@@ -1976 +1962 @@
     process_packet_commands(buf, size);
   }
-#endif
 }
 
@@ -2344 +2329 @@
 void game_net_init(int argc, char **argv)
 {
-#if !defined __CELLOS_LV2__
   int nonet=!net_init(argc, argv);
   if(nonet)
@@ -2369 +2353 @@
     }
   }
-#endif
 }
 
@@ -2466 +2449 @@
         g->get_input(); // prime the net
 
-#if !defined __CELLOS_LV2__
         for (int i = 1; i + 1 < argc; i++)
         {
@@ -2490 +2472 @@
             g->update_screen(); // redraw the screen with any changes
         }
-#endif
 
         while (!g->done())
@@ -2525 +2506 @@
                 demo_man.do_inputs();
 
-#if !defined __CELLOS_LV2__
             service_net_request();
-#endif
 
             // process all the objects in the world
             g->step();
-#if !defined __CELLOS_LV2__
             server_check();
-#endif
             g->calc_speed();
 
@@ -2541 +2518 @@
         }
 
-#if !defined __CELLOS_LV2__
         net_uninit();
 
@@ -2547 +2523 @@
             net_crcs->clean_up();
         delete net_crcs; net_crcs = NULL;
-#endif
 
         delete chat;
@@ -2586 +2561 @@
         Lisp::Uninit();
 
-#if !defined __CELLOS_LV2__
         base->packet.packet_reset();
-#endif
     }
     while (main_net_cfg && main_net_cfg->restart_state());

abuse/trunk/src/innet.cpp

@@ -23 +23 @@
 #include "dev.h"
 #include "timing.h"
-#include "fileman.h"
 #include "netface.h"
 
-#include "gserver.h"
-#include "gclient.h"
+#if HAVE_NETWORK
+#   include "fileman.h"
+#endif
+#include "net/sock.h"
+#include "net/ghandler.h"
+#include "net/gserver.h"
+#include "net/gclient.h"
 #include "dprint.h"
 #include "netcfg.h"
@@ -45 +49 @@
 base_memory_struct *base;   // points to shm_addr
 base_memory_struct local_base;
-net_address *net_server=NULL;
-net_protocol *prot=NULL;
-net_socket *comm_sock=NULL,*game_sock=NULL;
+net_address *net_server = NULL;
+net_protocol *prot = NULL;
+net_socket *comm_sock = NULL, *game_sock = NULL;
+game_handler *game_face = NULL;
 extern char lsf[256];
-game_handler *game_face=NULL;
 int local_client_number=0;        // 0 is the server
 join_struct *join_array=NULL;      // points to an array of possible joining clients
@@ -58 +62 @@
 int net_init(int argc, char **argv)
 {
-#if defined __CELLOS_LV2__
-    return 0;
-#else
     int i,x,db_level=0;
     base=&local_base;
@@ -150 +151 @@
     prot=usable;
     prot->set_debug_printing((net_protocol::debug_type)db_level);
+
     if (main_net_cfg->state==net_configuration::SERVER)
         set_login(main_net_cfg->name);
@@ -167 +169 @@
     }
 
-    fman=new file_manager(argc,argv,prot);                                       // manages remote file access
-    game_face=new game_handler;
+#if HAVE_NETWORK
+    fman = new file_manager(argc,argv,prot); // manages remote file access
+#endif
+    game_face = new game_handler;
     join_array=(join_struct *)malloc(sizeof(join_struct)*MAX_JOINERS);
     base->join_list=NULL;
@@ -181 +185 @@
 
     return 1;
-#endif
-}
-
-
-
+}
 
 int net_start()  // is the game starting up off the net? (i.e. -net hostname)
-{   return (main_net_cfg && main_net_cfg->state==net_configuration::CLIENT);  }
-
-
+{
+    return main_net_cfg && main_net_cfg->state == net_configuration::CLIENT;
+}
 
 int kill_net()
 {
-#if defined __CELLOS_LV2__
-  return 0;
-#else
   if (game_face) delete game_face;  game_face=NULL;
   if (join_array) free(join_array);  join_array=NULL;
   if (game_sock) { delete game_sock; game_sock=NULL; }
   if (comm_sock) { delete comm_sock; comm_sock=NULL; }
+#if HAVE_NETWORK
   delete fman;  fman=NULL;
+#endif
   if (net_server) { delete net_server; net_server=NULL; }
   if (prot)
   {
-
     prot->cleanup();
     prot=NULL;
     return 1;
-  } else return 0;
-#endif
+  }
+  return 0;
 }
 
@@ -219 +217 @@
 
 
+#if HAVE_NETWORK
 int NF_set_file_server(net_address *addr)
 {
-#if defined __CELLOS_LV2__
-  return 0;
-#else
   if (prot)
   {
@@ -237 +233 @@
     return cmd;
   } else return 0;
-#endif
 }
 
 int NF_set_file_server(char const *name)
 {
-#if !defined __CELLOS_LV2__
   if (prot)
   {
@@ -253 +247 @@
     } else return 0;
   }
-#endif
   return 0;
 }
@@ -260 +253 @@
 int NF_open_file(char const *filename, char const *mode)
 {
-#if !defined __CELLOS_LV2__
     if (prot)
         return fman->rf_open_file(filename,mode);
+    return -2;
+}
+
+
+long NF_close(int fd)
+{
+  if (prot)
+    return fman->rf_close(fd);
+  return 0;
+}
+
+long NF_read(int fd, void *buf, long size)
+{
+  if (prot)
+    return fman->rf_read(fd,buf,size);
+  return 0;
+}
+
+long NF_filelength(int fd)
+{
+  if (prot)
+    return fman->rf_file_size(fd);
+  return 0;
+}
+
+long NF_seek(int fd, long offset)
+{
+  if (prot)
+    return fman->rf_seek(fd,offset);
+  return 0;
+}
+
+long NF_tell(int fd)
+{
+  if (prot)
+    return fman->rf_tell(fd);
+  return 0;
+}
 #endif
-    return -2;
-}
-
-
-long NF_close(int fd)
-{
-#if !defined __CELLOS_LV2__
-  if (prot)
-    return fman->rf_close(fd);
-#endif
-  return 0;
-}
-
-long NF_read(int fd, void *buf, long size)
-{
-#if !defined __CELLOS_LV2__
-  if (prot)
-    return fman->rf_read(fd,buf,size);
-#endif
-  return 0;
-}
-
-long NF_filelength(int fd)
-{
-#if !defined __CELLOS_LV2__
-  if (prot)
-    return fman->rf_file_size(fd);
-#endif
-  return 0;
-}
-
-long NF_seek(int fd, long offset)
-{
-#if !defined __CELLOS_LV2__
-  if (prot)
-    return fman->rf_seek(fd,offset);
-#endif
-  return 0;
-}
-
-long NF_tell(int fd)
-{
-#if !defined __CELLOS_LV2__
-  if (prot)
-    return fman->rf_tell(fd);
-#endif
-  return 0;
-}
 
 
 void service_net_request()
 {
-#if !defined __CELLOS_LV2__
+#if HAVE_NETWORK
   if (prot)
   {
@@ -379 +361 @@
     }
   }
-#endif
+#endif // HAVE_NETWORK
 }
 
@@ -385 +367 @@
 int get_remote_lsf(net_address *addr, char *filename)  // filename should be 256 bytes
 {
-#if !defined __CELLOS_LV2__
   if (prot)
   {
@@ -406 +387 @@
 
   }
-#endif
   return 0;
 }
@@ -414 +394 @@
 int request_server_entry()
 {
-#if !defined __CELLOS_LV2__
   if (prot && main_net_cfg)
   {
@@ -487 +466 @@
     return cnum;
   }
-#endif
   return 0;
 }
@@ -493 +471 @@
 int reload_start()
 {
-#if !defined __CELLOS_LV2__
   if (prot)
     return game_face->start_reload();
-#endif
   return 0;
 }
@@ -502 +478 @@
 int reload_end()
 {
-#if !defined __CELLOS_LV2__
   if (prot)
     return game_face->end_reload();
-#endif
   return 0;
 }
@@ -512 +486 @@
 void net_reload()
 {
-#if !defined __CELLOS_LV2__
   if (prot)
   {
@@ -632 +605 @@
     }
   }
-#endif
 }
 
@@ -641 +613 @@
 void send_local_request()
 {
-
   if (prot)
   {
@@ -745 +716 @@
 int become_server(char *name)
 {
-#if !defined __CELLOS_LV2__
   if (prot && main_net_cfg)
   {
@@ -765 +735 @@
     return 1;
   }
-#endif
   return 0;
 }
@@ -771 +740 @@
 void read_new_views() { ; }
 
-
 void wait_min_players()
 {
-  if (game_face) game_face->game_start_wait();
-}
-
+    if (game_face)
+        game_face->game_start_wait();
+}
+

abuse/trunk/src/loader2.cpp

@@ -315 +315 @@
 #endif
 
-#if defined __CELLOS_LV2__
-  if (1)
-#else
   // don't let them specify a startup file we are connect elsewhere
   if (!net_start())
-#endif
   {
     for (int i=1; i<argc; i++)
@@ -336 +332 @@
     }
   }
-#if !defined __CELLOS_LV2__
   else if (!get_remote_lsf(net_server,lsf))
   {
@@ -342 +337 @@
     exit(0);
   }
-#endif
   char prog[100];
   char const *cs;

abuse/trunk/src/menu.cpp

@@ -38 +38 @@
 #include "netcfg.h"
 
-#if !defined __CELLOS_LV2__
-#   include "net/sock.h"
+#include "net/sock.h"
+
 extern net_protocol *prot;
-#else
-static int const prot = 0;
-#endif
 
 static VolumeWindow *volume_window;

abuse/trunk/src/net/Makefile.am

@@ -1 @@
-## Process this file with automake to produce Makefile.in
+
 noinst_LIBRARIES = libnet.a
 
@@ -14 +14 @@
 
 CPPFLAGS = @CPPFLAGS@ -DNO_CHECK
+

abuse/trunk/src/net/engine.cpp

@@ -13 +13 @@
 #endif
 
+#if HAVE_NETWORK
 #include "common.h"
 
@@ -1250 +1251 @@
 }
 
-
-
-
-
-
+#endif // HAVE_NETWORK
+

abuse/trunk/src/net/fileman.cpp

@@ -13 +13 @@
 #endif
 
+#if HAVE_NETWORK
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -518 +520 @@
   else return 0;
 }
+
+#endif // HAVE_NETWORK
+

abuse/trunk/src/net/gclient.cpp

@@ -20 +20 @@
 #include <sys/types.h>
 #include <string.h>
-#include <signal.h>
 
 #include "common.h"

abuse/trunk/src/net/gserver.cpp

@@ -20 +20 @@
 #include <sys/types.h>
 #include <string.h>
-#include <signal.h>
 
 #include "common.h"

abuse/trunk/src/net/netdrv.cpp

@@ -12 +12 @@
 #   include "config.h"
 #endif
+
+#if HAVE_NETWORK
 
 #include <stdio.h>
@@ -599 +601 @@
   return 0;
 }
+
+#endif // HAVE_NETWORK
+

abuse/trunk/src/net/netfile.cpp

@@ -13 +13 @@
 #endif
 
+#if HAVE_NETWORK
+
 #include "common.h"
 
@@ -18 +20 @@
 #include "../inc/netface.h"
 #include "engine.h"
-
 
 nfs_client *first_nfs_client=NULL;
@@ -473 +474 @@
 }
 
-
+#endif // HAVE_NETWORK
+

abuse/trunk/src/net/sock.cpp

@@ -22 +22 @@
 net_protocol *net_protocol::first=0;
 
+#if HAVE_NETWORK
 // connect to an explictedly named address
 // first try to get the address and then try to connect
 // return NULL if either fail.  This method does not need to be implemented
 // in sub-classes
-
 net_socket *net_protocol::connect_to_server(char const *&server_name, int port, int force_port, net_socket::socket_type sock_type)
 {
@@ -35 +35 @@
   return s;
 }
+#endif
 

abuse/trunk/src/net/tcpip.cpp

@@ -12 +12 @@
 #   include "config.h"
 #endif
+
+#if HAVE_NETWORK
 
 #ifdef _AIX
@@ -683 +685 @@
 //}}}
 
+#endif
+

abuse/trunk/src/net/undrv.cpp

@@ -12 +12 @@
 #   include "config.h"
 #endif
+
+#if HAVE_NETWORK
 
 #include <stdio.h>
@@ -200 +202 @@
     fman->process_net();
   }
-
-
-}
-
+}
+
+#endif // HAVE_NETWORK
+

abuse/trunk/src/netcfg.cpp

@@ -25 +25 @@
 #include "dev.h"
 
-#if !defined __CELLOS_LV2__
-#   include "net/sock.h"
-#endif
+#include "net/sock.h"
 
 extern char *get_login();
@@ -33 +31 @@
 extern char lsf[256];
 
-#if !defined __CELLOS_LV2__
 extern net_protocol *prot;
-#endif
 
 net_configuration::net_configuration()
 {
-#if !defined __CELLOS_LV2__
   strcpy(name,get_login());
 
   strcpy(server_name,"My Netgame");
-
 
   min_players=2;
@@ -51 +45 @@
   server_port=20202;
   state=SINGLE_PLAYER;
-#endif
 }
 
@@ -454 +447 @@
 {
   int ret=0;
-#if !defined __CELLOS_LV2__
   main_screen->clear();
 
@@ -599 +591 @@
     }
   }
-#endif
 
   return ret;

abuse/trunk/src/nfclient.cpp

@@ -30 +30 @@
 #include "cache.h"
 
-#include "gserver.h"
-
-#if !defined __CELLOS_LV2__
+#include "net/gserver.h"
 
 void remove_client(int client_number) { ; }
@@ -115 +113 @@
   }
 
-
+#if HAVE_NETWORK
   if (local_only)
   {
+#endif
     local=new jFILE(filename,mode);
     if (local->open_failure()) { delete local; local=NULL; }
+#if HAVE_NETWORK
   }
   else
   {
-
-
     char nm[256];
     strcpy(nm,filename);
@@ -135 +133 @@
     }
   }
+#endif
 }
 
@@ -149 +148 @@
   if (local)
     return local->read(buf,count);
+#if HAVE_NETWORK
   else if (nfs_fd>=0)
   {
@@ -158 +158 @@
     return a;
   }
+#endif
   else return 0;
 }
@@ -165 +166 @@
   if (local)
     return local->write(buf,count);
+#if HAVE_NETWORK
   else
   {
@@ -170 +172 @@
     exit(0);
   }
+#endif
   return 0;
 }
@@ -178 +181 @@
   if (local)
     return local->seek(off,whence);
+#if HAVE_NETWORK
   else if (nfs_fd>=0)
   {
@@ -185 +189 @@
       return NF_seek(nfs_fd,off);
   }
+#endif
   return 0;
 }
@@ -191 +196 @@
 {
   if (local)          return local->tell();
+#if HAVE_NETWORK
   else if (nfs_fd>=0) return NF_tell(nfs_fd);
+#endif
   else                return 0;
 }
@@ -199 +206 @@
 {
   if (local)          return local->file_size();
+#if HAVE_NETWORK
   else if (nfs_fd>=0) return NF_filelength(nfs_fd);
+#endif
   else                return 0;
 }
@@ -207 +216 @@
   flush_writes();
   if (local)          delete local;
+#if HAVE_NETWORK
   else if (nfs_fd>=0) NF_close(nfs_fd);
+#endif
 }
 
 int set_file_server(net_address *addr)
 {
+#if HAVE_NETWORK
   if (NF_set_file_server(addr))
   {
@@ -229 +241 @@
     return 1;
   }
+#endif
   return 0;
 }
@@ -247 +260 @@
 }
 
-#endif
-

abuse/trunk/src/nfserver.h

@@ -12 +12 @@
 #define __NFSERVER_HPP_
 
-#if !defined __CELLOS_LV2__
-
 #include "specs.h"
 #include "netface.h"
-#include "sock.h"
+#include "net/sock.h"
 
 int net_init(int argc, char **argv);
@@ -57 +55 @@
 
 #endif
-#endif
+

abuse/trunk/src/view.cpp

@@ -394 +394 @@
     }
 
-#if !defined __CELLOS_LV2__
     if( view_changed() )
     {
@@ -443 +442 @@
     base->packet.write_uint16((uint16_t)((int16_t)sug_px));
     base->packet.write_uint16((uint16_t)((int16_t)sug_py));
-#endif
 }
 
@@ -494 +492 @@
 int view::process_input(char cmd, uint8_t *&pk)   // return 0 if something went wrong
 {
-#if !defined __CELLOS_LV2__
   switch (cmd)
   {
@@ -566 +563 @@
     case SCMD_EXT_KEYRELEASE : set_key_down(*(pk++)+256,0); break;
   }
-#endif
   return 1;
 }
@@ -572 +568 @@
 int view::local_player()
 {
-#if defined __CELLOS_LV2__
-  return 1;
-#else
   return player_number==client_number();
-#endif
 }
 
@@ -1178 +1170 @@
 void process_packet_commands(uint8_t *pk, int size)
 {
-#if !defined __CELLOS_LV2__
   int32_t sync_uint16=-1;
 
@@ -1278 +1269 @@
     }
   } while (cmd!=SCMD_END_OF_PACKET);
-#endif
 }