kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #180 from MattTuttle/fix-mac-include

Browse Source 
Preventing duplicate objects error in ByteArray.h (lime:next)
This commit is contained in:
Joshua Granick
2014-07-08 23:08:03 -07:00
parent 5ef9f9809d fdec74b87a
commit aef2cfb800
3 changed files with 3 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
project/include/utils/ByteArray.h
View File

@@ -67,28 +67,7 @@ namespace lime {
extern int gFixedOrientation; extern int gFixedOrientation;
#elif defined(HX_MACOS) #elif defined(HX_MACOS)
#include <CoreFoundation/CoreFoundation.h> FILE *OpenRead(const char *inName);
FILE *OpenRead(const char *inName)
{
FILE *result = fopen(inName,"rb");
if (!result) {
CFStringRef str = CFStringCreateWithCString(NULL, inName, kCFStringEncodingUTF8);
CFURLRef path = CFBundleCopyResourceURL(CFBundleGetMainBundle(), str, NULL, NULL);
CFRelease(str);
if (path) {
str = CFURLCopyPath(path);
CFIndex maxSize = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str),kCFStringEncodingUTF8);
char *buffer = (char *)malloc(maxSize);
if (CFStringGetCString(str, buffer, maxSize, kCFStringEncodingUTF8)) {
result = fopen(buffer,"rb");
free(buffer);
}
CFRelease(str);
CFRelease(path);
}
}
return result;
}
#define OpenOverwrite(x) fopen(x,"wb") #define OpenOverwrite(x) fopen(x,"wb")
#else #else
#ifdef TIZEN #ifdef TIZEN

2
project/src/backend/sdl/SDLRenderer.cpp
View File

@@ -1,6 +1,6 @@
#include "SDLWindow.h" #include "SDLWindow.h"
#include "SDLRenderer.h" #include "SDLRenderer.h"
#include "../../graphics/opengl/OpenGLBindings.h" #include "../../graphics/OpenGLBindings.h"
namespace lime { namespace lime {

25
project/src/utils/ByteArray.cpp
View File

@@ -113,22 +113,7 @@ namespace lime {
} DEFINE_PRIM(lime_byte_array_get_native_pointer,1); } DEFINE_PRIM(lime_byte_array_get_native_pointer,1);
#ifdef HX_WINDOWS #if defined(HX_MACOS)
typedef wchar_t OSChar;
#define val_os_string val_wstring
#define OpenRead(x) _wfopen(x,L"rb")
#define OpenOverwrite(x) _wfopen(x,L"wb") // [ddc]
#else
typedef char OSChar;
#define val_os_string val_string
#if defined(IPHONE)
FILE *OpenRead(const char *inName);
FILE *OpenOverwrite(const char *inName); // [ddc]
extern int gFixedOrientation;
#elif defined(HX_MACOS)
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
FILE *OpenRead(const char *inName) FILE *OpenRead(const char *inName)
{ {
@@ -151,14 +136,6 @@ FILE *OpenRead(const char *inName)
} }
return result; return result;
} }
#define OpenOverwrite(x) fopen(x,"wb")
#else
#ifdef TIZEN
extern int gFixedOrientation;
#endif
#define OpenRead(x) fopen(x,"rb")
#define OpenOverwrite(x) fopen(x,"wb") // [ddc]
#endif
#endif #endif