- had to change variable name from brk to brck in sl1632 to avoid linker conflict

- added newline to end of sound.h
- updated Makefile to include the driver/pc stuff
- updates to the driver/pc to solve some linker errors

Makefile.am

@@ -8,6 +8,7 @@ include $(srcdir)/input/Makefile.am.inc
 include $(srcdir)/mappers/Makefile.am.inc
 # include mbshare/Makefile.am.inc
 include $(srcdir)/drivers/common/Makefile.am.inc
+include $(srcdir)/drivers/pc/Makefile.am.inc
 
 fceu_SOURCES	+=	$(sexyal_SOURCES)
 fceu_SOURCES    +=  $(fceud_SOURCES)

boards/sl1632.cpp

@@ -21,13 +21,13 @@
 #include "mapinc.h"
 #include "mmc3.h"
 
-static uint8 chrcmd[8], prg0, prg1, brk, mirr;
+static uint8 chrcmd[8], prg0, prg1, brck, mirr;
 static SFORMAT StateRegs[]=
 {
   {chrcmd, 8, "CHRCMD"},
   {&prg0, 1, "PRG0"},
   {&prg1, 1, "PRG1"},
-  {&brk, 1, "BRK"},
+  {&brck, 1, "BRK"},
   {&mirr, 1, "MIRR"},
   {0}
 };
@@ -54,9 +54,9 @@ static DECLFW(UNLSL1632CMDWrite)
 //  FCEU_printf("bs %04x %02x %3d\n",A,V,scanline);     
   if((A&0xA131)==0xA131)
   {
-    brk=V;
+    brck=V;
   }
-  if(brk&2)
+  if(brck&2)
   {
     FixMMC3PRG(MMC3_cmd);
     FixMMC3CHR(MMC3_cmd);
@@ -86,7 +86,7 @@ static DECLFW(UNLSL1632CMDWrite)
 
 static void StateRestore(int version)
 {
-  if(brk&2)
+  if(brck&2)
   {
     FixMMC3PRG(MMC3_cmd);
     FixMMC3CHR(MMC3_cmd);

drivers/pc/input.cpp

@@ -33,7 +33,7 @@ int UsrInputType[3]={SI_GAMEPAD,SI_GAMEPAD,SIFC_NONE};
 int InputType[3]={0,0,0};
 static int cspec=0;
    
-int gametype=0;
+extern int gametype;
 
 /* Necessary for proper GUI functioning(configuring when a game isn't loaded). */
 void InputUserActiveFix(void)

drivers/pc/main.cpp

@@ -70,7 +70,7 @@ int eoptions=0;
 
 static void DriverKill(void);
 static int DriverInitialize(FCEUGI *gi);
-int gametype;
+int gametype = 0;
 
 FCEUGI *CurGame=NULL;
 
@@ -543,11 +543,8 @@ void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
 
 
 /* Maybe ifndef WXWINDOWS would be better? ^_^ */
-#ifndef EXTGUI
 FILE *FCEUD_UTF8fopen(const char *fn, const char *mode)
 {
- return(fopen(fn,mode));
+    return(fopen(fn,mode));
 }
 
-
-#endif

sound.h

@@ -65,4 +65,4 @@ void FCEUSND_LoadState(int version);
 void FASTAPASS(1) FCEU_SoundCPUHook(int);
 void FP_FASTAPASS(2) Write_IRQFM (uint32 A, uint8 V); //mbg merge 7/17/06 brought over from latest mmbuild
 
-#endif
+#endif