mirror of
https://github.com/vale981/tdesktop
synced 2025-03-05 17:51:41 -05:00
Fix build after openal-soft update.
Regression was introduced in 91c85ec86b
.
This commit is contained in:
parent
496c361bdc
commit
8ef67c393b
6 changed files with 14 additions and 9 deletions
|
@ -16,7 +16,6 @@
|
||||||
'-lUxTheme',
|
'-lUxTheme',
|
||||||
'-lDbgHelp',
|
'-lDbgHelp',
|
||||||
'-lOpenAL32',
|
'-lOpenAL32',
|
||||||
'-lcommon',
|
|
||||||
'-lopus',
|
'-lopus',
|
||||||
'windows/common',
|
'windows/common',
|
||||||
'windows/handler/exception_handler',
|
'windows/handler/exception_handler',
|
||||||
|
|
|
@ -91,7 +91,11 @@ Go to ***BuildPath*** and run
|
||||||
cd openal-soft
|
cd openal-soft
|
||||||
git checkout openal-soft-1.19.1
|
git checkout openal-soft-1.19.1
|
||||||
cd build
|
cd build
|
||||||
|
if [ `uname -p` == "i686" ]; then
|
||||||
|
cmake -D LIBTYPE:STRING=STATIC -D ALSOFT_UTILS:BOOL=OFF ..
|
||||||
|
else
|
||||||
cmake -D LIBTYPE:STRING=STATIC ..
|
cmake -D LIBTYPE:STRING=STATIC ..
|
||||||
|
fi
|
||||||
make $MAKE_THREADS_CNT
|
make $MAKE_THREADS_CNT
|
||||||
sudo make install
|
sudo make install
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
|
@ -87,13 +87,13 @@ Open **x86 Native Tools Command Prompt for VS 2017.bat**, go to ***BuildPath***
|
||||||
msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm
|
msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm
|
||||||
cd ..\..\..\..
|
cd ..\..\..\..
|
||||||
|
|
||||||
git clone git://repo.or.cz/openal-soft.git
|
git clone https://github.com/john-preston/openal-soft.git
|
||||||
cd openal-soft
|
cd openal-soft
|
||||||
git checkout openal-soft-1.19.1
|
git checkout fix_macro
|
||||||
cd build
|
cd build
|
||||||
cmake -G "Visual Studio 15 2017" -D LIBTYPE:STRING=STATIC -D FORCE_STATIC_VCRT:STRING=ON ..
|
cmake -G "Visual Studio 15 2017" -D LIBTYPE:STRING=STATIC -D FORCE_STATIC_VCRT:STRING=ON ..
|
||||||
msbuild OpenAL32.vcxproj /property:Configuration=Debug
|
msbuild OpenAL.vcxproj /property:Configuration=Debug
|
||||||
msbuild OpenAL32.vcxproj /property:Configuration=Release
|
msbuild OpenAL.vcxproj /property:Configuration=Release
|
||||||
cd ..\..
|
cd ..\..
|
||||||
|
|
||||||
git clone https://github.com/google/breakpad
|
git clone https://github.com/google/breakpad
|
||||||
|
|
|
@ -102,8 +102,10 @@ Go to ***BuildPath*** and run
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
git clone git://repo.or.cz/openal-soft.git
|
git clone git://repo.or.cz/openal-soft.git
|
||||||
cd openal-soft/build
|
cd openal-soft
|
||||||
cmake -DLIBTYPE:STRING=STATIC -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 -DCMAKE_INSTALL_PREFIX:STRING=/usr/local/macold ..
|
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
|
make -j4
|
||||||
sudo make install
|
sudo make install
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
|
@ -90,7 +90,7 @@ Go to ***BuildPath*** and run
|
||||||
cd openal-soft
|
cd openal-soft
|
||||||
git checkout openal-soft-1.19.1
|
git checkout openal-soft-1.19.1
|
||||||
cd build
|
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
|
make -j4
|
||||||
sudo make install
|
sudo make install
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
|
@ -284,7 +284,7 @@ parts:
|
||||||
openal:
|
openal:
|
||||||
source: https://github.com/kcat/openal-soft.git
|
source: https://github.com/kcat/openal-soft.git
|
||||||
source-depth: 1
|
source-depth: 1
|
||||||
source-branch: v1.19
|
source-tag: openal-soft-1.19.1
|
||||||
plugin: cmake
|
plugin: cmake
|
||||||
build-packages:
|
build-packages:
|
||||||
- oss4-dev
|
- oss4-dev
|
||||||
|
|
Loading…
Add table
Reference in a new issue