Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Windows cross-build.

master
cybersphinx 2011-07-05 02:43:43 +02:00
parent c85c2d5d7b
commit ed753ff8c4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -77,14 +77,6 @@ AM_GNU_GETTEXT_VERSION([0.15])
PKG_PROG_PKG_CONFIG
AC_PROG_VERSION_CHECK([pkg-config], [0.9])
# Check for X11 (for qtgame)
X_LIBS=""
AC_PATH_X
if test x$no_x != "xyes"; then
X_LIBS="-lX11 -lXrandr ${X_LIBS}"
fi
AC_SUBST(X_LIBS)
# Check for Qt
PKG_CHECK_MODULES(QT4, QtCore QtGui QtOpenGL QtNetwork QtScript,,[:])
if test "$pkg_failed" = "yes" ; then
@ -136,6 +128,16 @@ esac
AM_CONDITIONAL([MINGW32], test "x$host_os_mingw32" = "xyes")
# Check for X11 (for qtgame)
if test "x$host_os_mingw32" != "xyes" ; then
X_LIBS=""
AC_PATH_X
if test x$no_x != "xyes"; then
X_LIBS="-lX11 -lXrandr ${X_LIBS}"
fi
AC_SUBST(X_LIBS)
fi
# Set compilers to use when building for the build system in a cross compile build
# Fallback to the system compilers
AC_ARG_VAR([CXX_FOR_BUILD], [C++ compiler that produces binaries that will run

2
lib/qtgame/qtgame.cpp
View File

@ -29,7 +29,7 @@ void QtGameWidget::trapMouse()
lpRect.top = y();
lpRect.left = x();
lpRect.bottom = y() + size().height();
lpRect.rigth = x() + size().width();
lpRect.right = x() + size().width();
ClipCursor(&lpRect);
#endif
mCursorTrapped = true;