diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-09-19 19:11:11 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-09-19 19:19:35 +0100 |
| commit | 157016930407bc3f09e7c3e707d4630ea30c361a (patch) | |
| tree | f3dd5521b9d3bec9136b656a8dc878eb2f5cd8ee | |
| parent | 33646efec3a6a57ac510edfa20d795b9647882b2 (diff) | |
| download | cogl-157016930407bc3f09e7c3e707d4630ea30c361a.tar.gz | |
mingw: don't fetch mesa_wgl.h + update summary blurb
mesa_wgl.h can no longer be fetched from upstream and since it's no
longer used anyway we don't fetch this any more. This also updates
the blurb printed after fetching dependencies to show how to run
./configure so we pass --enable-wgl not --enable-stub-winsys and
to also pass the -I path for the cogl-cross/include directory which has
the latest gl.h we fetched so the build doesn't try and use the headers
shipped with the mingw toolchain which may be out-of-date.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
| -rwxr-xr-x | build/mingw/mingw-fetch-dependencies.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/mingw/mingw-fetch-dependencies.sh b/build/mingw/mingw-fetch-dependencies.sh index 439e0282..f4083489 100755 --- a/build/mingw/mingw-fetch-dependencies.sh +++ b/build/mingw/mingw-fetch-dependencies.sh @@ -24,10 +24,9 @@ TOR_DEPS=( \ GL_HEADER_URLS=( \ http://cgit.freedesktop.org/mesa/mesa/plain/include/GL/gl.h \ - http://cgit.freedesktop.org/mesa/mesa/plain/include/GL/mesa_wgl.h \ http://www.opengl.org/registry/api/glext.h ); -GL_HEADERS=( gl.h mesa_wgl.h glext.h ); +GL_HEADERS=( gl.h glext.h ); function download_file () { @@ -329,7 +328,7 @@ echo echo "To get started, you should be able to configure and build from" echo "the top of your clutter source directory as follows:" echo -echo "./configure --host=\"$TARGET\" --target=\"$TARGET\" --build=\"\`./config.guess\`\" --enable-stub-winsys CFLAGS=\"-mms-bitfields\" PKG_CONFIG=\"$RUN_PKG_CONFIG\"" PKG_CONFIG_PATH= +echo "./configure --host=\"$TARGET\" --target=\"$TARGET\" --build=\"\`./build/config.guess\`\" --enable-wgl CFLAGS=\"-mms-bitfields -I$ROOT_DIR/include\" PKG_CONFIG=\"$RUN_PKG_CONFIG\"" PKG_CONFIG_PATH= echo "make" echo echo "Note: the explicit --build option is often necessary to ensure autoconf" |