asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13261 from ISylvox/fix-windows-build

Browse source 
Complete bc2e8d9 so that Windows can be built
This commit is contained in:
Juan Linietsky 2017-11-25 01:28:36 -03:00 committed by GitHub
commit 2c7b4c2053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/wasapi/audio_driver_wasapi.cpp
View file

@ -214,7 +214,7 @@ void AudioDriverWASAPI::thread_func(void *p_udata) {
if (ad->active) { if (ad->active) {
ad->lock(); ad->lock();
ad->audio_server_process(ad->buffer_frames, ad->samples_in.ptr()); ad->audio_server_process(ad->buffer_frames, ad->samples_in.ptrw());
ad->unlock(); ad->unlock();
} else { } else {

2
platform/windows/os_windows.cpp
View file

@ -1843,7 +1843,7 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments,
modstr.resize(cmdline.size()); modstr.resize(cmdline.size());
for (int i = 0; i < cmdline.size(); i++) for (int i = 0; i < cmdline.size(); i++)
modstr[i] = cmdline[i]; modstr[i] = cmdline[i];
int ret = CreateProcessW(NULL, modstr.ptr(), NULL, NULL, 0, NORMAL_PRIORITY_CLASS, NULL, NULL, si_w, &pi.pi); int ret = CreateProcessW(NULL, modstr.ptrw(), NULL, NULL, 0, NORMAL_PRIORITY_CLASS, NULL, NULL, si_w, &pi.pi);
ERR_FAIL_COND_V(ret == 0, ERR_CANT_FORK); ERR_FAIL_COND_V(ret == 0, ERR_CANT_FORK);
if (p_blocking) { if (p_blocking) {