Mercurial > mxe-octave
changeset 1235:7e9f957b3239
package openal: combine patch files, portability fixes, and add test program
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Fri, 01 Oct 2010 02:03:08 +1000 |
| parents | 3c63edcea6db |
| children | e5c95a508f2a |
| files | src/openal-1-fixes.patch src/openal-1-static.patch src/openal-2-static.patch src/openal-test.c src/openal.mk |
| diffstat | 5 files changed, 85 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openal-1-fixes.patch Fri Oct 01 02:03:08 2010 +1000 @@ -0,0 +1,57 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +diff -urN openal-soft-1.12.854.orig/include/AL/al.h openal-soft-1.12.854.new/include/AL/al.h +--- openal-soft-1.12.854.orig/include/AL/al.h 2010-03-29 17:23:32.000000000 +1100 ++++ openal-soft-1.12.854.new/include/AL/al.h 2010-10-01 01:04:45.000000000 +1000 +@@ -5,6 +5,10 @@ + extern "C" { + #endif + ++#if 1 ++ #define AL_API ++ #define AL_APIENTRY ++#else + #if defined(_WIN32) && !defined(_XBOX) + #if defined(AL_BUILD_LIBRARY) + #define AL_API __declspec(dllexport) +@@ -18,6 +22,7 @@ + #define AL_API extern + #endif + #endif ++#endif + + #if defined(_WIN32) + #define AL_APIENTRY __cdecl +diff -urN openal-soft-1.12.854.orig/include/AL/alc.h openal-soft-1.12.854.new/include/AL/alc.h +--- openal-soft-1.12.854.orig/include/AL/alc.h 2010-03-29 17:23:52.000000000 +1100 ++++ openal-soft-1.12.854.new/include/AL/alc.h 2010-10-01 01:04:45.000000000 +1000 +@@ -5,6 +5,10 @@ + extern "C" { + #endif + ++#if 1 ++ #define ALC_API ++ #define ALC_APIENTRY ++#else + #if defined(_WIN32) && !defined(_XBOX) + #if defined(AL_BUILD_LIBRARY) + #define ALC_API __declspec(dllexport) +@@ -18,6 +22,7 @@ + #define ALC_API extern + #endif + #endif ++#endif + + #if defined(_WIN32) + #define ALC_APIENTRY __cdecl +diff -urN openal-soft-1.12.854.orig/openal.pc.in openal-soft-1.12.854.new/openal.pc.in +--- openal-soft-1.12.854.orig/openal.pc.in 2008-07-24 04:55:49.000000000 +1000 ++++ openal-soft-1.12.854.new/openal.pc.in 2010-10-01 01:04:45.000000000 +1000 +@@ -7,5 +7,5 @@ + Description: OpenAL is a cross-platform 3D audio API + Requires: @PKG_CONFIG_REQUIRES@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@ ++Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@ -lwinmm + Cflags: -I${includedir}
--- a/src/openal-1-static.patch Fri Oct 01 01:56:08 2010 +1000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ ---- a/include/AL/al.h 2010-03-29 08:23:32.000000000 +0200 -+++ b/include/AL/al.h 2010-09-30 15:45:27.845778136 +0200 -@@ -5,6 +5,10 @@ - extern "C" { - #endif - -+#if 1 -+ #define AL_API -+ #define AL_APIENTRY -+#else - #if defined(_WIN32) && !defined(_XBOX) - #if defined(AL_BUILD_LIBRARY) - #define AL_API __declspec(dllexport) -@@ -18,6 +22,7 @@ - #define AL_API extern - #endif - #endif -+#endif - - #if defined(_WIN32) - #define AL_APIENTRY __cdecl
--- a/src/openal-2-static.patch Fri Oct 01 01:56:08 2010 +1000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ ---- a/include/AL/alc.h 2010-03-29 08:23:52.000000000 +0200 -+++ b/include/AL/alc.h 2010-09-30 15:45:54.681777409 +0200 -@@ -5,6 +5,10 @@ - extern "C" { - #endif - -+#if 1 -+ #define ALC_API -+ #define ALC_APIENTRY -+#else - #if defined(_WIN32) && !defined(_XBOX) - #if defined(AL_BUILD_LIBRARY) - #define ALC_API __declspec(dllexport) -@@ -18,6 +22,7 @@ - #define ALC_API extern - #endif - #endif -+#endif - - #if defined(_WIN32) - #define ALC_APIENTRY __cdecl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openal-test.c Fri Oct 01 02:03:08 2010 +1000 @@ -0,0 +1,21 @@ +/* This file is part of mingw-cross-env. */ +/* See doc/index.html for further information. */ + +#include <AL/alc.h> + +int main(int argc, char **argv) +{ + ALCdevice *dev; + ALCcontext *ctx; + + (void)argc; + (void)argv; + + dev = alcOpenDevice(0); + ctx = alcCreateContext(dev, 0); + + alcDestroyContext(ctx); + alcCloseDevice(dev); + + return 0; +} \ No newline at end of file
--- a/src/openal.mk Fri Oct 01 01:56:08 2010 +1000 +++ b/src/openal.mk Fri Oct 01 02:03:08 2010 +1000 @@ -33,9 +33,11 @@ -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(TARGET)' \ -DCMAKE_BUILD_TYPE=Release \ -DLIBTYPE=STATIC - cd '$(1)/build' && $(MAKE) -j '$(JOBS)' - cd '$(1)/build' && cp -fv OpenAL32.a $(PREFIX)/$(TARGET)/lib/libOpenAL32.a - cd '$(1)/build' && cp -rfv openal.pc $(PREFIX)/$(TARGET)/lib/pkgconfig - $(SED) -i 's,^\(Libs:.*\),\1 -lwinmm,' $(PREFIX)/$(TARGET)/lib/pkgconfig/openal.pc - cd '$(1)' && cp -rfv include/* $(PREFIX)/$(TARGET)/include + $(MAKE) -C '$(1)/build' -j '$(JOBS)' install + ln -sf '$(PREFIX)/$(TARGET)/lib/OpenAL32.a' '$(PREFIX)/$(TARGET)/lib/libOpenAL32.a' + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-openal.exe' \ + `'$(TARGET)-pkg-config' openal --cflags --libs` endef