updated fix for SF bug 3459998

This commit is contained in:
Stanislav Shwartsman 2012-02-20 06:43:53 +00:00
parent 1599031869
commit 45b6eae291
3 changed files with 590 additions and 562 deletions

View File

@ -334,7 +334,7 @@ wxbochs_resources.o: wxbochs.rc
# for win32 gui
win32res.o: win32res.rc bxversion.rc
$(RC_CMD)$@ $(srcdir)/win32res.rc -I.
$(RC_CMD)$@ $(srcdir)/win32res.rc
#####################################################################
# Install target for all platforms.

1146
bochs/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -2064,7 +2064,7 @@ if test "$with_sdl" = yes; then
EXTRA_BX_OBJS="$EXTRA_BX_OBJS win32res.o"
;;
*-cygwin* | *-mingw32*)
RC_CMD="windres -o "
RC_CMD="windres -I. -o "
EXTRA_BX_OBJS="$EXTRA_BX_OBJS win32res.o"
;;
esac
@ -2110,7 +2110,7 @@ if test "$with_win32" = yes; then
;;
*-cygwin* | *-mingw32*)
if test "$with_wx" != yes; then
RC_CMD="windres -o "
RC_CMD="windres -I. -o "
EXTRA_BX_OBJS="$EXTRA_BX_OBJS win32res.o"
fi
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_WIN32)"