Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mac OS Marmalade fixes 

Fixed compile issues on Mac OS
This commit is contained in:
Mat Hopwood 2012-12-06 14:00:08 +00:00 committed by James Chen
parent d99a278c23
commit f75f6c2b64
2 changed files with 174 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/third_party/marmalade/freetype.mkf vendored
View File

@ -8,7 +8,7 @@ options
strict=0 strict=0
} }
if {{ defined __APPLE__ }} if {{ sys.platform == 'darwin' }}
{ {
define FT_CONFIG_OPTION_NO_ASSEMBLER define FT_CONFIG_OPTION_NO_ASSEMBLER
define DARWIN_NO_CARBON define DARWIN_NO_CARBON

18
cocos2dx/textures/CCTexturePVR.cpp
View File

@ -122,15 +122,15 @@ typedef enum {
kPVR3TexturePixelFormat_PVRTC_4BPP_RGBA = 3, kPVR3TexturePixelFormat_PVRTC_4BPP_RGBA = 3,
/* supported channel type formats */ /* supported channel type formats */
kPVR3TexturePixelFormat_BGRA_8888 = 0x0808080861726762, kPVR3TexturePixelFormat_BGRA_8888 = 0x0808080861726762ULL,
kPVR3TexturePixelFormat_RGBA_8888 = 0x0808080861626772, kPVR3TexturePixelFormat_RGBA_8888 = 0x0808080861626772ULL,
kPVR3TexturePixelFormat_RGBA_4444 = 0x0404040461626772, kPVR3TexturePixelFormat_RGBA_4444 = 0x0404040461626772ULL,
kPVR3TexturePixelFormat_RGBA_5551 = 0x0105050561626772, kPVR3TexturePixelFormat_RGBA_5551 = 0x0105050561626772ULL,
kPVR3TexturePixelFormat_RGB_565 = 0x0005060500626772, kPVR3TexturePixelFormat_RGB_565 = 0x0005060500626772ULL,
kPVR3TexturePixelFormat_RGB_888 = 0x0008080800626772, kPVR3TexturePixelFormat_RGB_888 = 0x0008080800626772ULL,
kPVR3TexturePixelFormat_A_8 = 0x0000000800000061, kPVR3TexturePixelFormat_A_8 = 0x0000000800000061ULL,
kPVR3TexturePixelFormat_L_8 = 0x000000080000006c, kPVR3TexturePixelFormat_L_8 = 0x000000080000006cULL,
kPVR3TexturePixelFormat_LA_88 = 0x000008080000616c, kPVR3TexturePixelFormat_LA_88 = 0x000008080000616cULL,
} ccPVR3TexturePixelFormat; } ccPVR3TexturePixelFormat;