godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

An update to the dylibloader for older inttypes

Browse Source 
This #define's older inttypes to their newer versions and #includes
<stdint.h> in the generated files. This will help with older
glibc/compiler versions using headers generated on newer systems.

This closes #46223
This commit is contained in:
Hein-Pieter van Braam-Stewart
2021-02-20 00:13:33 +01:00
parent dc1ae06557
commit 5233d78f49
9 changed files with 8703 additions and 5210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10274
drivers/alsa/asound-so_wrap.c
View File

File diff suppressed because it is too large Load Diff

6
drivers/alsa/asound-so_wrap.h
View File

@@ -2,9 +2,11 @@
#define DYLIBLOAD_WRAPPER_ASOUND
// This file is generated. Do not edit!
// see https://github.com/hpvb/dynload-wrapper for details
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.2 on 2021-02-18 00:19:14
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:12
// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/alsa/asoundlib.h --sys-include <alsa/asoundlib.h> --soname libasound.so.2 --init-name asound --output-header asound-so_wrap.h --output-implementation asound-so_wrap.c
//
#include <stdint.h>
#define snd_asoundlib_version snd_asoundlib_version_dylibloader_orig_asound
#define snd_dlpath snd_dlpath_dylibloader_orig_asound
#define snd_dlopen snd_dlopen_dylibloader_orig_asound
@@ -5141,7 +5143,7 @@ extern void (*snd_midi_event_no_status_dylibloader_wrapper_asound)( snd_midi_eve
extern long (*snd_midi_event_encode_dylibloader_wrapper_asound)( snd_midi_event_t*,const unsigned char*, long, snd_seq_event_t*);
extern int (*snd_midi_event_encode_byte_dylibloader_wrapper_asound)( snd_midi_event_t*, int, snd_seq_event_t*);
extern long (*snd_midi_event_decode_dylibloader_wrapper_asound)( snd_midi_event_t*, unsigned char*, long,const snd_seq_event_t*);
int initialize_asound();
int initialize_asound(int verbose);
#ifdef __cplusplus
}
#endif

11
drivers/alsa/audio_driver_alsa.cpp
View File

@@ -39,7 +39,7 @@
#ifdef PULSEAUDIO_ENABLED
extern "C" {
extern int initialize_pulse();
extern int initialize_pulse(int verbose);
}
#endif
@@ -153,13 +153,18 @@ Error AudioDriverALSA::init_device() {
}
Error AudioDriverALSA::init() {
#ifdef DEBUG_ENABLED
int dylibloader_verbose = 1;
#else
int dylibloader_verbose = 0;
#endif
#ifdef PULSEAUDIO_ENABLED
// On pulse enabled systems Alsa will silently use pulse.
// It doesn't matter if this fails as that likely means there is no pulse
initialize_pulse();
initialize_pulse(dylibloader_verbose);
#endif
if (initialize_asound()) {
if (initialize_asound(dylibloader_verbose)) {
return ERR_CANT_OPEN;
}