removed unzip.c (I think this was an old bastardized zlib. we should be using uptodate zlib).

added config.c, perhaps a useful concept, or perhaps it wont be worth its own file in the long run. contains an "about" message to be returned from newly-added FCEUI_GetAboutString()
added FCEUD_GetCompilerString() sine I think as little stuff like this as possible should be done through the makefile system, and because it might be helpful to have some info about the driver in there.
removed some version info from the makefiles--this should be done in types.h now

[[Split portion of a mixed commit.]]

Makefile.am

@@ -1,11 +1,9 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS	=	fceu
-fceu_SOURCES 	= 	fceustr.c cart.c cheat.c crc32.c debug.c endian.c fceu.c fds.c file.c filter.c general.c ines.cpp input.c md5.c memory.c netplay.c nsf.c palette.c ppu.c sound.c state.c unif.c video.c vsuni.c wave.c x6502.c movie.c
+fceu_SOURCES 	= 	fceustr.c cart.c cheat.c crc32.c config.c debug.c endian.c fceu.c fds.c file.c filter.c general.c ines.cpp input.c md5.c memory.c netplay.c nsf.c palette.c ppu.c sound.c state.c unif.c video.c vsuni.c wave.c x6502.c movie.c
 # soundexp.c
 
-fceu_SOURCES	+=	unzip.c
-
 include $(srcdir)/boards/Makefile.am.inc
 include $(srcdir)/input/Makefile.am.inc
 include $(srcdir)/mappers/Makefile.am.inc

config.c

@@ -0,0 +1,33 @@
+#include "types.h"
+#include "fceu.h"
+#include <string.h>
+#include <stdio.h>
+
+static char *aboutString = 0;
+
+char *FCEUI_GetAboutString() {
+	const char *aboutTemplate = 
+	FCEU_NAME_AND_VERSION"\n\
+~CAST~\n\
+FCE - Bero\n\
+FCEU - Xodnizel\n\
+FCEU XD - Bbitmaster & Parasyte\n\
+FCEU XD SP - Sebastian Porst\n\
+FCEU MM - CaH4e3\n\
+FCEU TAS - blip & nitsuja\n\
+FCEU TAS+ - Luke Gustafson\n\
+FCEUX\n\
+ - CaH4e3, Luke Gustafson\n\
+ - Matthew Gambrell, Sebastian Porst\n\
+\n\
+"__TIME__" "__DATE__"\n";
+
+		char *compilerString = FCEUD_GetCompilerString();
+
+	//allocate the string and concatenate the template with the compiler string
+	if(aboutString) free(aboutString);
+	aboutString = (char*)malloc(strlen(aboutTemplate) + strlen(compilerString) + 1);
+	strcpy(aboutString,aboutTemplate);
+	strcat(aboutString,compilerString);
+	return aboutString;
+}

driver.h

@@ -13,6 +13,9 @@ extern "C" {
 
 FILE *FCEUD_UTF8fopen(const char *fn, const char *mode);
 
+//mbg 7/23/06
+char *FCEUD_GetCompilerString();
+
 /* This makes me feel dirty for some reason. */
 void FCEU_printf(char *format, ...);
 #define FCEUI_printf FCEU_printf

drivers/win/main.c

@@ -239,49 +239,29 @@ void FCEUD_PrintError(char *s)
 //---------------------------
 //mbg merge 6/29/06 - new aboutbox
 
-//generate an msvc-compatible compiler version string if necessary
+#ifdef _M_X64
-#ifdef MSVC
+  #define _MSVC_ARCH "x64"
- #ifdef _M_X64
-   #define _MSVC_ARCH "x64"
- #else
-   #define _MSVC_ARCH "x86"
- #endif
- #ifdef _DEBUG
-  #define _MSVC_BUILD "debug"
- #else 
-  #define _MSVC_BUILD "release"
- #endif
- #define __COMPILER__STRING__ "msvc " _Py_STRINGIZE(_MSC_VER) " " _MSVC_ARCH " " _MSVC_BUILD
- #define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
- #define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
- #define _Py_STRINGIZE2(X) #X
- //re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
 #else
-  #define __COMPILER__STRING__ "gcc " __VERSION__
+  #define _MSVC_ARCH "x86"
 #endif
+#ifdef _DEBUG
+ #define _MSVC_BUILD "debug"
+#else 
+ #define _MSVC_BUILD "release"
+#endif
+#define __COMPILER__STRING__ "msvc " _Py_STRINGIZE(_MSC_VER) " " _MSVC_ARCH " " _MSVC_BUILD
+#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
+#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
+#define _Py_STRINGIZE2(X) #X
+//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
+
+char *FCEUD_GetCompilerString() {
+	return 	__COMPILER__STRING__;
+}
 
 void ShowAboutBox(void)
 {
-sprintf(TempArray,
+ MessageBox(hAppWnd,FCEUI_GetAboutString(),FCEU_NAME,MB_OK);
-
-FCEU_NAME_AND_VERSION"\n\
-~CAST~\n\
-FCE - Bero\n\
-FCEU - Xodnizel\n\
-FCEU XD - Bbitmaster & Parasyte\n\
-FCEU XD SP - Sebastian Porst\n\
-FCEU MM - CaH4e3\n\
-FCEU TAS - blip & nitsuja\n\
-FCEU TAS+ - Luke Gustafson\n\
-FCEUX\n\
- - CaH4e3, Luke Gustafson\n\
- - Matthew Gambrell, Sebastian Porst\n\
-\n\
-"__TIME__" "__DATE__"\n\
-" __COMPILER__STRING__
-);
-
- MessageBox(hAppWnd,TempArray,"About FCEUXD SP",MB_OK);
 }
 
 //mbg 6/30/06 - indicates that the main loop should close the game as soon as it can

fceu.h

@@ -27,6 +27,9 @@ void SetAutoFirePattern(int onframes, int offframes);
 void AutoFire(void);
 void FCEUI_Rewind(void);
 
+//mbg 7/23/06
+char *FCEUI_GetAboutString();
+
 extern uint64 timestampbase;
 extern uint32 MMC5HackVROMMask;
 extern uint8 *MMC5HackExNTARAMPtr;

ines.cpp

@@ -82,7 +82,7 @@ static int MapperNo=0;
 */
 
 
-static int DECLFR(TrainerRead)
+static DECLFR(TrainerRead)
 {
  return(trainerpoo[A&0x1FF]);
 }