Fix build after openal-soft update.

Regression was introduced in 91c85ec86b.
This commit is contained in:
John Preston 2018-11-08 15:26:44 +04:00
parent 496c361bdc
commit 8ef67c393b
6 changed files with 14 additions and 9 deletions

View File

@ -16,7 +16,6 @@
'-lUxTheme',
'-lDbgHelp',
'-lOpenAL32',
'-lcommon',
'-lopus',
'windows/common',
'windows/handler/exception_handler',

View File

@ -91,7 +91,11 @@ Go to ***BuildPath*** and run
cd openal-soft
git checkout openal-soft-1.19.1
cd build
if [ `uname -p` == "i686" ]; then
cmake -D LIBTYPE:STRING=STATIC -D ALSOFT_UTILS:BOOL=OFF ..
else
cmake -D LIBTYPE:STRING=STATIC ..
fi
make $MAKE_THREADS_CNT
sudo make install
cd ../..

View File

@ -87,13 +87,13 @@ Open **x86 Native Tools Command Prompt for VS 2017.bat**, go to ***BuildPath***
msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm
cd ..\..\..\..
git clone git://repo.or.cz/openal-soft.git
git clone https://github.com/john-preston/openal-soft.git
cd openal-soft
git checkout openal-soft-1.19.1
git checkout fix_macro
cd build
cmake -G "Visual Studio 15 2017" -D LIBTYPE:STRING=STATIC -D FORCE_STATIC_VCRT:STRING=ON ..
msbuild OpenAL32.vcxproj /property:Configuration=Debug
msbuild OpenAL32.vcxproj /property:Configuration=Release
msbuild OpenAL.vcxproj /property:Configuration=Debug
msbuild OpenAL.vcxproj /property:Configuration=Release
cd ..\..
git clone https://github.com/google/breakpad

View File

@ -102,8 +102,10 @@ Go to ***BuildPath*** and run
cd ..
git clone git://repo.or.cz/openal-soft.git
cd openal-soft/build
cmake -DLIBTYPE:STRING=STATIC -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_INSTALL_PREFIX:STRING=/usr/local/macold ..
cd openal-soft
git checkout openal-soft-1.19.1
cd build
LDFLAGS='-isysroot /' cmake -DLIBTYPE:STRING=STATIC -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_INSTALL_PREFIX:STRING=/usr/local/macold ..
make -j4
sudo make install
cd ../..

View File

@ -90,7 +90,7 @@ Go to ***BuildPath*** and run
cd openal-soft
git checkout openal-soft-1.19.1
cd build
cmake -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8 ..
LDFLAGS='-isysroot /' cmake -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8 ..
make -j4
sudo make install
cd ../..

View File

@ -284,7 +284,7 @@ parts:
openal:
source: https://github.com/kcat/openal-soft.git
source-depth: 1
source-branch: v1.19
source-tag: openal-soft-1.19.1
plugin: cmake
build-packages:
- oss4-dev