- in wxwindows compile, only include the wxwindows cflags on the few

files that need them.  This is more in line with the other gui libraries,
  and the compile line is easier to read.
- modified: Makefile.in configure.in configure gui/Makefile.in

bochs/Makefile.in

@@ -100,7 +100,7 @@ GUI_LINK_OPTS_MACOS =
 GUI_LINK_OPTS_CARBON = -framework Carbon
 GUI_LINK_OPTS_NOGUI =
 GUI_LINK_OPTS_TERM = @GUI_LINK_OPTS_TERM@
-GUI_LINK_OPTS_WX = `wx-config --libs` 
+GUI_LINK_OPTS_WX = @GUI_LINK_OPTS_WX@
 GUI_LINK_OPTS = @GUI_LINK_OPTS@
 RANLIB = @RANLIB@
 
@@ -192,7 +192,7 @@ $(BX_OBJS): $(BX_INCLUDES)
 bxversion.h:
 	$(RM) -f bxversion.h
 	echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
-	echo '// $$Id: Makefile.in,v 1.74 2002-09-04 21:13:21 bdenney Exp $$' >> bxversion.h
+	echo '// $$Id: Makefile.in,v 1.75 2002-09-05 15:12:08 bdenney Exp $$' >> bxversion.h
 	echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
 	echo '// This file is generated by "make bxversion.h"' >> bxversion.h
 	echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h

bochs/configure.in

@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.4)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.91 2002-09-02 18:44:35 kevinlawton Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.92 2002-09-05 15:12:10 bdenney Exp $]])
 AC_CONFIG_HEADER(config.h)
 
 dnl // Put Bochs version information right here so that it gets substituted
@@ -1257,14 +1257,15 @@ elif test "$with_term" = yes; then
 elif test "$with_wx" = yes; then
   AC_MSG_RESULT(wxWindows)
   AC_DEFINE(BX_WITH_WX, 1)
-  CFLAGS="$CFLAGS `wx-config --cflags`"
-  CXXFLAGS="$CFLAGS `wx-config --cxxflags`"
+  WX_CFLAGS="\`$WX_CONFIG --cflags\`"
+  WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
+  GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs\`"
   # if gtk-config exists, then add it to the cflags.
   gtkconf=`gtk-config --cflags`
   if test $? = 0; then
     # gtk-config was found and returned 0, so it must return valid output
-    CFLAGS="$CFLAGS `gtk-config --cflags`"
-    CXXFLAGS="$CXXFLAGS `gtk-config --cflags`"
+    WX_CFLAGS="$WX_CFLAGS \`gtk-config --cflags\`"
+    WX_CXXFLAGS="$WX_CXXFLAGS \`gtk-config --cflags\`"
   fi
   # wxwindows is the only one without control.o in GUI_OBJS
   GUI_OBJS='$(GUI_OBJS_WX)'
@@ -1276,6 +1277,9 @@ else
   GUI_LINK_OPTS='$(GUI_LINK_OPTS_NOGUI)'
 fi
 
+AC_SUBST(WX_CFLAGS)
+AC_SUBST(WX_CXXFLAGS)
+
 # modify settings based on target platform
 case "$target" in
   *-macos*)
@@ -1571,6 +1575,7 @@ AC_SUBST(RFB_LIBS)
 AC_SUBST(GUI_OBJS)
 AC_SUBST(GUI_LINK_OPTS)
 AC_SUBST(GUI_LINK_OPTS_TERM)
+AC_SUBST(GUI_LINK_OPTS_WX)
 AC_SUBST(DASH)
 AC_SUBST(SLASH)
 AC_SUBST(CXXFP)

bochs/gui/Makefile.in

@@ -33,7 +33,7 @@ SHELL = /bin/sh
 @SET_MAKE@
 
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@  `wx-config --cxxflags`
+CXXFLAGS = @CXXFLAGS@ 
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -41,6 +41,7 @@ X_CFLAGS = @X_CFLAGS@
 BEOS_CFLAGS = -Wno-multichar
 RFB_CFLAGS =
 SDL_CFLAGS = `sdl-config --cflags`
+WX_CXXFLAGS = @WX_CXXFLAGS@
 RANLIB = @RANLIB@
 
 GUI_OBJS_X11  = x.o
@@ -93,9 +94,14 @@ sdl.o: sdl.@CPP_SUFFIX@ sdl.h
 rfb.o: rfb.@CPP_SUFFIX@ rfb.h rfbproto.h
 	$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(RFB_CFLAGS) $<
 
-x.@CPP_SUFFIX@cc: gui.h
+wx.o: wx.@CPP_SUFFIX@
+	$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(WX_CXXFLAGS) $<
 
-beos.@CPP_SUFFIX@cc: gui.h
+wxmain.o: wxmain.@CPP_SUFFIX@
+	$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(WX_CXXFLAGS) $<
+
+wxdialog.o: wxdialog.@CPP_SUFFIX@
+	$(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(WX_CXXFLAGS) $<
 
 clean:
 	@RMCOMMAND@ *.o