Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake build scripts #56

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open

CMake build scripts #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
65402b5
CMake support
Frost-54 Jul 22, 2023
1903a18
Ignore cmake and clangd outputs
Frost-54 Jul 22, 2023
8fd2895
Add build tests
Frost-54 Jul 22, 2023
48b59de
Fix: should be run
Frost-54 Jul 22, 2023
7471864
Run apt with sudo
Frost-54 Jul 22, 2023
c349278
Disable objc on non-apple platforms
Frost-54 Jul 22, 2023
fd939db
ninja is ninja-build in apt
Frost-54 Jul 22, 2023
23a82bb
Do not use broken mingw on windows
Frost-54 Jul 22, 2023
d2fb419
Quote visual studio generator
Frost-54 Jul 22, 2023
1094d7c
Fix: -T should be defined in toolchain
Frost-54 Jul 22, 2023
02858a4
Fix: add pwd to cmake --build
Frost-54 Jul 22, 2023
693a98f
Try to fix linux build error
Frost-54 Jul 22, 2023
887781a
Should be CXX
Frost-54 Jul 22, 2023
323e360
Fix: MSVC does not support warnings other than -Wall
Frost-54 Jul 22, 2023
4ea20b6
Use stdafx on windows
Frost-54 Jul 22, 2023
d84f84a
Try if clang works
Frost-54 Jul 22, 2023
e332478
Fix: should be stdafx.h
Frost-54 Jul 22, 2023
3f206ba
Enable exception for clang
Frost-54 Jul 22, 2023
ec7a0e7
Add compiler to windows run name
Frost-54 Jul 22, 2023
280f469
Fix linux compiler error
Frost-54 Jul 22, 2023
5c674b5
Linux compiler error fixed.
Frost-54 Jul 22, 2023
35e8c79
Fix: should be -fcxx-exceptions
Frost-54 Jul 22, 2023
a47052e
Fix: clang-cl uses different command line syntax
Frost-54 Jul 22, 2023
bfd6e9f
Use MSVC style
Frost-54 Jul 22, 2023
5660d75
Fix linux compiler error
Frost-54 Jul 22, 2023
e712745
Capital EH
Frost-54 Jul 22, 2023
326fabf
Use fexceptions for both gcc and clang
Frost-54 Jul 22, 2023
a536432
libxxf86vm-dev is also required
Frost-54 Jul 22, 2023
2a7b195
Enable EHa
Frost-54 Jul 22, 2023
8526522
Include Platform.h to undefine linux
Frost-54 Jul 22, 2023
838b4ff
Windows 8.0+ is required for xaudio
Frost-54 Jul 22, 2023
c80ab14
MAKEINTATOM returns LPTSTR, but a LPCWSTR is expected
Frost-54 Jul 22, 2023
5799f53
MAKEINTATOM returns LPTSTR, but a LPCWSTR is expected
Frost-54 Jul 22, 2023
ff60271
Add required libraries
Frost-54 Jul 22, 2023
deb5d4c
Fix constexpr variable 'closeSocket' must be initialized by a constan…
Frost-54 Jul 22, 2023
89e88c4
Fix windows linking errors
Frost-54 Jul 22, 2023
e5ae402
Fix xaudio CreateMasteringVoice error
Frost-54 Jul 23, 2023
e664b9f
Fix: CreateMasteringVoice does not take in DeviceId
Frost-54 Jul 23, 2023
b439bb3
Fix linking error
Frost-54 Jul 23, 2023
39b5530
Fix more link errors
Frost-54 Jul 23, 2023
cc4639b
Remove .lib in link libraries
Frost-54 Jul 23, 2023
d201e8f
Fix windows entry point: WinMain is for WINDOWS subsystem
Frost-54 Jul 23, 2023
dcedf9c
Fix: Xaudio error is larger than integer max
Frost-54 Jul 23, 2023
1ff45cc
Add missing ':'
Frost-54 Jul 23, 2023
8f2eebe
Add missing ':'
Frost-54 Jul 23, 2023
e0124f0
Fix windows error code larger than int max
Frost-54 Jul 23, 2023
c394da6
Fix syntax error
Frost-54 Jul 23, 2023
4bc87d9
Fix syntax error
Frost-54 Jul 23, 2023
72aa4dd
Add return type
Frost-54 Jul 23, 2023
df5287c
HRESULT is not large enough on clang-cl
Frost-54 Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix xaudio CreateMasteringVoice error
  • Loading branch information
@Frost-54
Frost-54 committed Jul 23, 2023
commit e5ae402a3a42b9e57d127a3cd4faa89ae0b0b498
8 changes: 6 additions & 2 deletions engine/audio/xaudio2/XAudio27.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@ HRESULT IXAudio2CreateMasteringVoice(IXAudio2* pXAudio2,
UINT32 InputSampleRate,
UINT32 Flags,
UINT32 DeviceIndex,
const XAUDIO2_EFFECT_CHAIN* pEffectChain)
LPCWSTR szDeviceId,
const XAUDIO2_EFFECT_CHAIN* pEffectChain,
AUDIO_STREAM_CATEGORY StreamCategory)
{
return pXAudio2->CreateMasteringVoice(ppMasteringVoice,
InputChannels,
InputSampleRate,
Flags,
DeviceIndex,
pEffectChain);
szDeviceId,
pEffectChain,
StreamCategory);
}

HRESULT IXAudio2CreateSourceVoice(IXAudio2* pXAudio2,
Expand Down
4 changes: 3 additions & 1 deletion engine/audio/xaudio2/XAudio27.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ HRESULT IXAudio2CreateMasteringVoice(IXAudio2* pXAudio2,
UINT32 InputSampleRate = XAUDIO2_DEFAULT_SAMPLERATE,
UINT32 Flags = 0,
UINT32 DeviceIndex = 0,
const XAUDIO2_EFFECT_CHAIN* pEffectChain = nullptr);
LPCWSTR szDeviceId = nullptr,
const XAUDIO2_EFFECT_CHAIN* pEffectChain = nullptr,
AUDIO_STREAM_CATEGORY StreamCategory = AudioCategory_GameMedia);
HRESULT IXAudio2CreateSourceVoice(IXAudio2* pXAudio2,
IXAudio2SourceVoice** ppSourceVoice,
const WAVEFORMATEX* pSourceFormat,
Expand Down