Mercurial > mxe-octave

comparison src/openal-1-fixes.patch @ 1235:7e9f957b3239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
children 3c3b8b1aaf3d
comparison
equal deleted inserted replaced
1234:3c63edcea6db 1235:7e9f957b3239
1 # This file is part of mingw-cross-env.
2 # See doc/index.html for further information.
3
4 diff -urN openal-soft-1.12.854.orig/include/AL/al.h openal-soft-1.12.854.new/include/AL/al.h
5 --- openal-soft-1.12.854.orig/include/AL/al.h 2010-03-29 17:23:32.000000000 +1100
6 +++ openal-soft-1.12.854.new/include/AL/al.h 2010-10-01 01:04:45.000000000 +1000
7 @@ -5,6 +5,10 @@
8 extern "C" {
9 #endif
10
11 +#if 1
12 + #define AL_API
13 + #define AL_APIENTRY
14 +#else
15 #if defined(_WIN32) && !defined(_XBOX)
16 #if defined(AL_BUILD_LIBRARY)
17 #define AL_API __declspec(dllexport)
18 @@ -18,6 +22,7 @@
19 #define AL_API extern
20 #endif
21 #endif
22 +#endif
23
24 #if defined(_WIN32)
25 #define AL_APIENTRY __cdecl
26 diff -urN openal-soft-1.12.854.orig/include/AL/alc.h openal-soft-1.12.854.new/include/AL/alc.h
27 --- openal-soft-1.12.854.orig/include/AL/alc.h 2010-03-29 17:23:52.000000000 +1100
28 +++ openal-soft-1.12.854.new/include/AL/alc.h 2010-10-01 01:04:45.000000000 +1000
29 @@ -5,6 +5,10 @@
30 extern "C" {
31 #endif
32
33 +#if 1
34 + #define ALC_API
35 + #define ALC_APIENTRY
36 +#else
37 #if defined(_WIN32) && !defined(_XBOX)
38 #if defined(AL_BUILD_LIBRARY)
39 #define ALC_API __declspec(dllexport)
40 @@ -18,6 +22,7 @@
41 #define ALC_API extern
42 #endif
43 #endif
44 +#endif
45
46 #if defined(_WIN32)
47 #define ALC_APIENTRY __cdecl
48 diff -urN openal-soft-1.12.854.orig/openal.pc.in openal-soft-1.12.854.new/openal.pc.in
49 --- openal-soft-1.12.854.orig/openal.pc.in 2008-07-24 04:55:49.000000000 +1000
50 +++ openal-soft-1.12.854.new/openal.pc.in 2010-10-01 01:04:45.000000000 +1000
51 @@ -7,5 +7,5 @@
52 Description: OpenAL is a cross-platform 3D audio API
53 Requires: @PKG_CONFIG_REQUIRES@
54 Version: @PACKAGE_VERSION@
55 -Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@
56 +Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@ -lwinmm
57 Cflags: -I${includedir}