From 2f7076c1687dcf163ee4e63105e37bac9d9aebd3 Mon Sep 17 00:00:00 2001 From: Vincas Dargis Date: Mon, 27 Jun 2016 20:34:10 +0300 Subject: [PATCH] fix(build): fix OpenAL build on Windows Add OpenAL-specific define to fix `error: redefinition of 'struct timespec'` when compiling with MinGW. `timespec` is already defined within MinGW, but probably detection does not work correctly. Partially fixes #3372 --- windows/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/bootstrap.sh b/windows/bootstrap.sh index 901cf0cfe..dc7c0d124 100644 --- a/windows/bootstrap.sh +++ b/windows/bootstrap.sh @@ -62,7 +62,7 @@ fi if [ ! -f "bin/OpenAL32.dll" ]; then pushd openal-soft-1.16.0/build - cmake -G "MSYS Makefiles" -DQT_QMAKE_EXECUTABLE=NOTFOUND -DCMAKE_BUILD_TYPE=Release -DALSOFT_REQUIRE_DSOUND=NO -DCMAKE_INSTALL_PREFIX=$QTOX_DIR/libs .. + CFLAGS="-D_TIMESPEC_DEFINED" cmake -G "MSYS Makefiles" -DQT_QMAKE_EXECUTABLE=NOTFOUND -DCMAKE_BUILD_TYPE=Release -DALSOFT_REQUIRE_DSOUND=NO -DCMAKE_INSTALL_PREFIX=$QTOX_DIR/libs .. make make install popd