From 1334d93a7042e17d795e062899a3c4ae6894de64 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 26 Feb 2018 00:27:25 +0000 Subject: [PATCH 1/3] Added new targets for Travis matrix. Signed-off-by: Natalia Portillo --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d0cde59..4ebc730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,8 @@ language: c env: matrix: - CROSS=y + - PROG=VACRCem-debug CROSS=y DEBUG=y + - PROG=VACRCem-dev CROSS=y DEBUG=y DEV_BUILD=y script: - cd src From 6d9a85869e45c8cf6b968967d3f86b35798aa011 Mon Sep 17 00:00:00 2001 From: darkstar Date: Mon, 26 Feb 2018 01:33:01 +0100 Subject: [PATCH 2/3] MSVC: Fix the function pointer declarations for OpenAL The __cdecl needs to go inside the parentheses... I hope this also works for mingw... --- src/sound/openal.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/sound/openal.c b/src/sound/openal.c index b92b17a..a77ca60 100644 --- a/src/sound/openal.c +++ b/src/sound/openal.c @@ -77,24 +77,24 @@ static ALuint source[3]; /* audio source */ static void *openal_handle = NULL; /* handle to (open) DLL */ /* Pointers to the real functions. */ -static ALC_API ALCdevice* ALC_APIENTRY (*f_alcOpenDevice)(const ALCchar *devicename); -static ALC_API ALCboolean ALC_APIENTRY (*f_alcCloseDevice)(ALCdevice *device); -static ALC_API ALCcontext* ALC_APIENTRY (*f_alcCreateContext)(ALCdevice *device, const ALCint* attrlist); -static ALC_API void ALC_APIENTRY (*f_alcDestroyContext)(ALCcontext *context); -static ALC_API ALCboolean ALC_APIENTRY (*f_alcMakeContextCurrent)(ALCcontext *context); -static ALC_API ALCcontext* ALC_APIENTRY (*f_alcGetCurrentContext)(void); -static ALC_API ALCdevice* ALC_APIENTRY (*f_alcGetContextsDevice)(ALCcontext *context); -static AL_API void AL_APIENTRY (*f_alSource3f)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); -static AL_API void AL_APIENTRY (*f_alSourcef)(ALuint source, ALenum param, ALfloat value); -static AL_API void AL_APIENTRY (*f_alSourcei)(ALuint source, ALenum param, ALint value); -static AL_API void AL_APIENTRY (*f_alBufferData)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq); -static AL_API void AL_APIENTRY (*f_alSourceQueueBuffers)(ALuint source, ALsizei nb, const ALuint *buffers); -static AL_API void AL_APIENTRY (*f_alSourceUnqueueBuffers)(ALuint source, ALsizei nb, ALuint *buffers); -static AL_API void AL_APIENTRY (*f_alSourcePlay)(ALuint source); -static AL_API void AL_APIENTRY (*f_alGetSourcei)(ALuint source, ALenum param, ALint *value); -static AL_API void AL_APIENTRY (*f_alListenerf)(ALenum param, ALfloat value); -static AL_API void AL_APIENTRY (*f_alGenBuffers)(ALsizei n, ALuint *buffers); -static AL_API void AL_APIENTRY (*f_alGenSources)(ALsizei n, ALuint *sources); +static ALC_API ALCdevice* (ALC_APIENTRY *f_alcOpenDevice)(const ALCchar *devicename); +static ALC_API ALCboolean (ALC_APIENTRY *f_alcCloseDevice)(ALCdevice *device); +static ALC_API ALCcontext* (ALC_APIENTRY *f_alcCreateContext)(ALCdevice *device, const ALCint* attrlist); +static ALC_API void (ALC_APIENTRY *f_alcDestroyContext)(ALCcontext *context); +static ALC_API ALCboolean (ALC_APIENTRY *f_alcMakeContextCurrent)(ALCcontext *context); +static ALC_API ALCcontext* (ALC_APIENTRY *f_alcGetCurrentContext)(void); +static ALC_API ALCdevice* (ALC_APIENTRY *f_alcGetContextsDevice)(ALCcontext *context); +static AL_API void (AL_APIENTRY *f_alSource3f)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3); +static AL_API void (AL_APIENTRY *f_alSourcef)(ALuint source, ALenum param, ALfloat value); +static AL_API void (AL_APIENTRY *f_alSourcei)(ALuint source, ALenum param, ALint value); +static AL_API void (AL_APIENTRY *f_alBufferData)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq); +static AL_API void (AL_APIENTRY *f_alSourceQueueBuffers)(ALuint source, ALsizei nb, const ALuint *buffers); +static AL_API void (AL_APIENTRY *f_alSourceUnqueueBuffers)(ALuint source, ALsizei nb, ALuint *buffers); +static AL_API void (AL_APIENTRY *f_alSourcePlay)(ALuint source); +static AL_API void (AL_APIENTRY *f_alGetSourcei)(ALuint source, ALenum param, ALint *value); +static AL_API void (AL_APIENTRY *f_alListenerf)(ALenum param, ALfloat value); +static AL_API void (AL_APIENTRY *f_alGenBuffers)(ALsizei n, ALuint *buffers); +static AL_API void (AL_APIENTRY *f_alGenSources)(ALsizei n, ALuint *sources); static dllimp_t openal_imports[] = { { "alcOpenDevice", &f_alcOpenDevice }, From cb572705d3dc9dd220b357077642acd2b02caf04 Mon Sep 17 00:00:00 2001 From: darkstar Date: Mon, 26 Feb 2018 01:33:42 +0100 Subject: [PATCH 3/3] MSVC: Enable the use of OpenAL for sound output --- src/win/msvc15/global.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/msvc15/global.props b/src/win/msvc15/global.props index 653cbde..555d8a7 100644 --- a/src/win/msvc15/global.props +++ b/src/win/msvc15/global.props @@ -7,7 +7,7 @@ - _USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;USE_DYNAREC + _USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;USE_DYNAREC;USE_OPENAL