From d8ce7bf134b59e94116188795f8e6bc86d7d9c7c Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 26 Apr 2018 14:11:58 -0700 Subject: [PATCH] Binding fix --- lime/_backend/native/NativeCFFI.hx | 2 +- project/src/media/openal/OpenALBindings.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lime/_backend/native/NativeCFFI.hx b/lime/_backend/native/NativeCFFI.hx index 8b3f69729..ea327c4cf 100644 --- a/lime/_backend/native/NativeCFFI.hx +++ b/lime/_backend/native/NativeCFFI.hx @@ -451,7 +451,7 @@ class NativeCFFI { @:cffi private static function lime_alc_suspend_context (context:CFFIPointer):Void; #if hl - @:hlNative("lime", "hl_lime_alc_open_device") private static function hl_lime_alc_open_device (devicename:hl.Bytes):lime.media.openal.ALDevice { return null; }; + @:hlNative("lime", "lime_alc_open_device") private static function hl_lime_alc_open_device (devicename:hl.Bytes):lime.media.openal.ALDevice { return null; }; #end @:cffi private static function lime_al_gen_filter():CFFIPointer; diff --git a/project/src/media/openal/OpenALBindings.cpp b/project/src/media/openal/OpenALBindings.cpp index de41cce3f..d649d6f6f 100644 --- a/project/src/media/openal/OpenALBindings.cpp +++ b/project/src/media/openal/OpenALBindings.cpp @@ -14,7 +14,6 @@ #define HL_NAME(n) hl_##n #include - #include #include #include @@ -1889,7 +1888,7 @@ namespace lime { } - HL_PRIM ALCdevice* HL_NAME (alc_open_device) (vbyte *devicename) { + HL_PRIM ALCdevice* hl_lime_alc_open_device (vbyte *devicename) { ALCdevice* alcDevice = alcOpenDevice ((char*)devicename); atexit (lime_al_atexit); @@ -2053,10 +2052,11 @@ namespace lime { DEFINE_PRIME1v (lime_alc_resume_device); DEFINE_PRIME1v (lime_alc_suspend_context); + #define TDEVICE _ABSTRACT (alc_device) #define TCONTEXT _ABSTRACT (alc_context) - DEFINE_HL_PRIM (TDEVICE, hl_lime_alc_open_device, _BYTES); + DEFINE_HL_PRIM (TDEVICE, lime_alc_open_device, _BYTES); }