Some fixes for compilation on 64-bit systems. Fixed mixing of long/int

types in state file handling.  Added '--x-libraries' option to configure,
to specify different locations for X11 (only affects UNIX port).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@869 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/configure

@@ -45,6 +45,7 @@ NASMFLAGS=""
 NASM=""
 _prefix=/usr/local
 _have_x86=""
+X_LIBS="/usr/X11R6/lib"
 
 _srcdir=`dirname $0`
 
@@ -274,6 +275,8 @@ Optional Libraries:
   --with-nasm-prefix=DIR   Prefix where nasm executable is installed (optional)
   --disable-nasm           disable assembly language optimizations [autodetect]
 
+  --x-libraries            Path to X11 libraries [${X_LIBS}]
+
 Some influential environment variables:
   LDFLAGS	linker flags, e.g. -L<lib dir> if you have libraries in a
   		nonstandard directory <lib dir>
@@ -326,6 +329,10 @@ for ac_option in $@; do
         arg=`echo $ac_option | cut -d '=' -f 2`
         _nasmpath="$arg:$arg/bin"
         ;;
+      --x-libraries=*)
+        arg=`echo $ac_option | cut -d '=' -f 2`
+        X_LIBS="$arg"
+        ;;
       --host=*)
         _host=`echo $ac_option | cut -d '=' -f 2`
         ;;
@@ -720,7 +727,7 @@ case $_host_os in
 			# Add OpenGL stuff
 			if test "$_build_gl" = yes ; then
 				DEFINES="$DEFINES -DDISPLAY_OPENGL"
-				LIBS="$LIBS -L/usr/X11R6/lib -lGL"
+				LIBS="$LIBS -L$X_LIBS -lGL"
 			fi
 			;;
 		win32)

stella/src/emucore/Deserializer.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Deserializer.cxx,v 1.4 2005-06-16 01:11:27 stephena Exp $
+// $Id: Deserializer.cxx,v 1.5 2005-10-29 18:11:29 stephena Exp $
 //============================================================================
 
 #include <iostream>
@@ -78,8 +78,8 @@ string Deserializer::getString(void)
 {
   long len = getLong();
   string str;
-  str.resize(len);
-  myStream->read(&str[0], len);
+  str.resize((string::size_type)len);
+  myStream->read(&str[0], (streamsize)len);
 
   if(myStream->bad())
     throw "Deserializer: file read failed";