- removed conv.c from the fceu build

- got rid of the NETWORK defines... they shouldn't be relevant any more

drivers/pc/main.cpp

@@ -458,9 +458,7 @@ static void DriverKill(void)
 
 void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
 {
- #ifdef NETWORK
  extern int FCEUDnetplay;
- #endif
 
  int ocount = Count;
  // apply frame scaling to Count
@@ -506,7 +504,6 @@ void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
     }
    }
   } //else puts("Skipped");
-  #ifdef NETWORK
   else if(!NoWaiting && FCEUDnetplay && (uflow || tmpcan >= (Count * 1.8)))
   {
    if(Count > tmpcan) Count=tmpcan;
@@ -517,7 +514,6 @@ void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
     tmpcan -= Count;
    }
   }
-  #endif
 
  }
  else

drivers/pc/sdl.cpp

@@ -4,9 +4,7 @@
 
 #include "sdl.h"
 #include "sdl-video.h"
-#ifdef NETWORK
 #include "unix-netplay.h"
-#endif
 
 DSETTINGS Settings;
 CFGSTRUCT DriverConfig[]={
@@ -29,13 +27,11 @@ CFGSTRUCT DriverConfig[]={
 	AC(_fullscreen),
         AC(_xres),
 	AC(_yres),
-	#ifdef NETWORK
         ACS(netplaynick),
 	AC(netlocalplayers),
 	AC(tport),
 	ACS(netpassword),
 	ACS(netgamekey),
-	#endif
         ENDCFGSTRUCT
 };
 
@@ -85,13 +81,11 @@ ARGPSTRUCT DriverArgs[]={
          {"-yres",0,&_yres,0},
          {"-fs",0,&_fullscreen,0},
          //{"-fshack",0,&_fshack,0x4001},
-	 #ifdef NETWORK
          {"-connect",0,&netplayhost,0x4001},
          {"-netport",0,&tport,0},
 	 {"-netlocalplayers",0,&netlocalplayers,0},
 	 {"-netnick",0,&netplaynick,0x4001},
 	 {"-netpassword",0,&netpassword,0x4001},
-	 #endif
          {0,0,0,0}
 };
 

drivers/pc/unix-netplay.cpp

@@ -1,4 +1,3 @@
-#ifdef NETWORK
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
@@ -317,5 +316,3 @@ void FCEUD_NetplayText(uint8 *text)
  puts(tot);
  free(tot);
 }
-#endif
-

drivers/pc/unix-netplay.h

@@ -1,9 +1,6 @@
-#ifdef NETWORK
 extern char *netplaynick;
 extern char *netplayhost;
 extern char *netpassword;
 extern char *netgamekey;
 extern int tport;
 extern int netlocalplayers;
-
-#endif

netplay.cpp

@@ -88,13 +88,11 @@ int FCEUNET_SendCommand(uint8 cmd, uint32 len)
  buf[0] = 0xFF;
  FCEU_en32lsb(&buf[numlocal], len);
  buf[numlocal + 4] = cmd;
- #ifdef NETWORK
  if(!FCEUD_SendData(buf,numlocal + 1 + 4)) 
  {
   NetError();
   return(0);
  }
- #endif
  return(1);
 }
 
@@ -135,7 +133,6 @@ int FCEUNET_SendFile(uint8 cmd, char *fn)
 
  len = clen + 4;
 
- #ifdef NETWORK
  if(!FCEUNET_SendCommand(cmd,len))
  {
   free(cbuf);
@@ -147,7 +144,6 @@ int FCEUNET_SendFile(uint8 cmd, char *fn)
   free(cbuf);
   return(0);
  }
- #endif
  free(cbuf);
 
  return(1);
@@ -217,7 +213,6 @@ void NetplayUpdate(uint8 *joyp)
  /* This shouldn't happen, but just in case.  0xFF is used as a command escape elsewhere. */
  if(joypb[0] == 0xFF) 
   joypb[0] = 0xF;
- #ifdef NETWORK
  if(!netdcount)
   if(!FCEUD_SendData(joypb,numlocal))
   {
@@ -325,7 +320,6 @@ void NetplayUpdate(uint8 *joyp)
 			    break;
   }
  } while(buf[4]);
- #endif
 
  netdcount=(netdcount+1)%netdivisor;
 

palettes/SConscript

@@ -1,6 +1,5 @@
 Import('file_list')
 my_list =  Split("""
-conv.c
 """)
 for x in range(len(my_list)):
   my_list[x] = 'palettes/' + my_list[x]