diff options
author | Volker Grabsch <vog@notjusthosting.com> | 2010-11-28 21:28:35 (GMT) |
---|---|---|
committer | Volker Grabsch <vog@notjusthosting.com> | 2010-11-28 21:28:35 (GMT) |
commit | 1f1ff5d8f1f473d2b39cc791734b5905f22e68bb (patch) | |
tree | 7c39e262442c91a1468658a90dc8340baa844c3e /src/openal-1-fixes.patch | |
parent | 0c78444409b237dc700c8739c226509d47b8e496 (diff) | |
download | mxe-1f1ff5d8f1f473d2b39cc791734b5905f22e68bb.zip mxe-1f1ff5d8f1f473d2b39cc791734b5905f22e68bb.tar.gz mxe-1f1ff5d8f1f473d2b39cc791734b5905f22e68bb.tar.bz2 |
replace the ugly hacks with clean patches for package openal
Diffstat (limited to 'src/openal-1-fixes.patch')
-rw-r--r-- | src/openal-1-fixes.patch | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/src/openal-1-fixes.patch b/src/openal-1-fixes.patch deleted file mode 100644 index 1d4b281..0000000 --- a/src/openal-1-fixes.patch +++ /dev/null @@ -1,109 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Contains ad hoc patches for cross building. - -From 0ea58dd9662da43ee86682a35608f913f522aadb Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Fri, 1 Oct 2010 18:44:51 +0200 -Subject: [PATCH] cross building workarounds - - -diff --git a/Alc/ALc.c b/Alc/ALc.c ---- a/Alc/ALc.c -+++ b/Alc/ALc.c -@@ -239,34 +239,8 @@ - - /////////////////////////////////////////////////////// - // ALC Related helper functions --#ifdef _WIN32 --static void alc_init(void); --static void alc_deinit(void); -- --BOOL APIENTRY DllMain(HANDLE hModule,DWORD ul_reason_for_call,LPVOID lpReserved) --{ -- (void)lpReserved; -- -- // Perform actions based on the reason for calling. -- switch(ul_reason_for_call) -- { -- case DLL_PROCESS_ATTACH: -- DisableThreadLibraryCalls(hModule); -- alc_init(); -- break; -- -- case DLL_PROCESS_DETACH: -- alc_deinit(); -- break; -- } -- return TRUE; --} --#else --#ifdef HAVE_GCC_DESTRUCTOR - static void alc_init(void) __attribute__((constructor)); - static void alc_deinit(void) __attribute__((destructor)); --#endif --#endif - - static void alc_init(void) - { -diff --git a/include/AL/al.h b/include/AL/al.h -index c409701..f4cf45b 100644 ---- a/include/AL/al.h -+++ b/include/AL/al.h -@@ -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 @@ extern "C" { - #define AL_API extern - #endif - #endif -+#endif - - #if defined(_WIN32) - #define AL_APIENTRY __cdecl -diff --git a/include/AL/alc.h b/include/AL/alc.h -index 4e84af4..67f8797 100644 ---- a/include/AL/alc.h -+++ b/include/AL/alc.h -@@ -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 @@ extern "C" { - #define ALC_API extern - #endif - #endif -+#endif - - #if defined(_WIN32) - #define ALC_APIENTRY __cdecl -diff --git a/openal.pc.in b/openal.pc.in -index aaf95bb..d78376f 100644 ---- a/openal.pc.in -+++ b/openal.pc.in -@@ -7,5 +7,5 @@ Name: OpenAL - 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} --- -1.7.1 - |