Yet another win32 build fix. cpu/resolve.cc renamed to cpu/resolver.cc

because it conflicts with disasm/resolve.cc.

bochs/bx_debug/dbg_main.cc

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: dbg_main.cc,v 1.159 2008-10-02 06:48:33 sshwarts Exp $
+// $Id: dbg_main.cc,v 1.160 2008-10-07 07:47:56 akrisak Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -435,6 +435,10 @@ int bxwrap(void)
   return(0); // keep compiler quiet
 }
 
+#ifdef WIN32
+char* bxtext;
+#endif
+
 void bxerror(char *s)
 {
   dbg_printf("%s:%d: %s at '%s'\n",

bochs/cpu/Makefile.in

@@ -53,7 +53,7 @@ OBJS = \
 	init.o \
 	cpu.o \
 	icache.o \
-	resolve.o \
+	resolver.o \
 	fetchdecode.o \
 	access.o \
 	access32.o \
@@ -656,7 +656,7 @@ protect_ctrl.o: protect_ctrl.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
   lazy_flags.h icache.h apic.h ../cpu/i387.h ../fpu/softfloat.h \
   ../config.h ../fpu/tag_w.h ../fpu/status_w.h ../fpu/control_w.h \
   ../cpu/xmm.h stack.h
-resolve.o: resolve.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
+resolver.o: resolver.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
   ../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
   ../gui/siminterface.h ../memory/memory.h ../pc_system.h ../plugin.h \
   ../extplugin.h ../gui/gui.h ../gui/textconfig.h ../config.h \

bochs/cpu/resolver.cc

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: resolve.cc,v 1.5 2008-09-16 19:20:03 sshwarts Exp $
+// $Id: resolver.cc,v 1.1 2008-10-07 07:47:56 akrisak Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //   Copyright (c) 2008 Stanislav Shwartsman