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

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

@ -1,165 +1,165 @@
includepaths
{
"h"
"./freetype/include"
}
options
{
strict=0
}
if {{ defined __APPLE__ }}
{
define FT_CONFIG_OPTION_NO_ASSEMBLER
define DARWIN_NO_CARBON
}
files
{
[src/autofit]
("./freetype/src/autofit")
autofit.c
[src/base]
("./freetype/src/base")
ftbase.c
ftbbox.c
ftbdf.c
ftbitmap.c
ftcid.c
ftfstype.c
ftgasp.c
ftglyph.c
ftgxval.c
ftinit.c
ftlcdfil.c
ftmm.c
ftotval.c
ftpatent.c
ftpfr.c
ftstroke.c
ftsynth.c
ftsystem.c
fttype1.c
ftwinfnt.c
[src/bdf]
("./freetype/src/bdf")
bdf.c
[src/cache]
("./freetype/src/cache")
ftcache.c
[src/cff]
("./freetype/src/cff")
cff.c
[src/cid]
("./freetype/src/cid")
type1cid.c
[src/gzip]
("./freetype/src/gzip")
ftgzip.c
[src/lzw]
("./freetype/src/lzw")
ftlzw.c
[src/pcf]
("./freetype/src/pcf")
pcf.c
[src/pfr]
("./freetype/src/pfr")
pfr.c
[src/psaux]
("./freetype/src/psaux")
psaux.c
[src/pshinter]
("./freetype/src/pshinter")
pshinter.c
[src/psnames]
("./freetype/src/psnames")
psmodule.c
[src/raster]
("./freetype/src/raster")
raster.c
[src/sfntr]
("./freetype/src/sfnt")
sfnt.c
[src/smooth]
("./freetype/src/smooth")
smooth.c
[src/truetype]
("./freetype/src/truetype")
truetype.c
[src/type1]
("./freetype/src/type1")
type1.c
[src/type42]
("./freetype/src/type42")
type42.c
[src/winfonts]
("./freetype/src/winfonts")
winfnt.c
[include]
("./freetype/include")
ft2build.h
freetype/config/ftconfig.h
freetype/config/ftheader.h
freetype/config/ftmodule.h
freetype/config/ftoption.h
freetype/config/ftstdlib.h
freetype/freetype.h
freetype/ftbbox.h
freetype/ftbdf.h
freetype/ftbitmap.h
freetype/ftcache.h
freetype/ftcid.h
freetype/fterrdef.h
freetype/fterrors.h
freetype/ftgasp.h
freetype/ftglyph.h
freetype/ftgxval.h
freetype/ftgzip.h
freetype/ftimage.h
freetype/ftincrem.h
freetype/ftlcdfil.h
freetype/ftlist.h
freetype/ftlzw.h
freetype/ftmac.h
freetype/ftmm.h
freetype/ftmodapi.h
freetype/ftmoderr.h
freetype/ftotval.h
freetype/ftoutln.h
freetype/ftpfr.h
freetype/ftrender.h
freetype/ftsizes.h
freetype/ftsnames.h
freetype/ftstroke.h
freetype/ftsynth.h
freetype/ftsystem.h
freetype/fttrigon.h
freetype/fttypes.h
freetype/ftwinfnt.h
freetype/ftxf86.h
freetype/t1tables.h
freetype/ttnameid.h
freetype/tttables.h
freetype/tttags.h
freetype/ttunpat.h
}
includepaths
{
"h"
"./freetype/include"
}
options
{
strict=0
}
if {{ sys.platform == 'darwin' }}
{
define FT_CONFIG_OPTION_NO_ASSEMBLER
define DARWIN_NO_CARBON
}
files
{
[src/autofit]
("./freetype/src/autofit")
autofit.c
[src/base]
("./freetype/src/base")
ftbase.c
ftbbox.c
ftbdf.c
ftbitmap.c
ftcid.c
ftfstype.c
ftgasp.c
ftglyph.c
ftgxval.c
ftinit.c
ftlcdfil.c
ftmm.c
ftotval.c
ftpatent.c
ftpfr.c
ftstroke.c
ftsynth.c
ftsystem.c
fttype1.c
ftwinfnt.c
[src/bdf]
("./freetype/src/bdf")
bdf.c
[src/cache]
("./freetype/src/cache")
ftcache.c
[src/cff]
("./freetype/src/cff")
cff.c
[src/cid]
("./freetype/src/cid")
type1cid.c
[src/gzip]
("./freetype/src/gzip")
ftgzip.c
[src/lzw]
("./freetype/src/lzw")
ftlzw.c
[src/pcf]
("./freetype/src/pcf")
pcf.c
[src/pfr]
("./freetype/src/pfr")
pfr.c
[src/psaux]
("./freetype/src/psaux")
psaux.c
[src/pshinter]
("./freetype/src/pshinter")
pshinter.c
[src/psnames]
("./freetype/src/psnames")
psmodule.c
[src/raster]
("./freetype/src/raster")
raster.c
[src/sfntr]
("./freetype/src/sfnt")
sfnt.c
[src/smooth]
("./freetype/src/smooth")
smooth.c
[src/truetype]
("./freetype/src/truetype")
truetype.c
[src/type1]
("./freetype/src/type1")
type1.c
[src/type42]
("./freetype/src/type42")
type42.c
[src/winfonts]
("./freetype/src/winfonts")
winfnt.c
[include]
("./freetype/include")
ft2build.h
freetype/config/ftconfig.h
freetype/config/ftheader.h
freetype/config/ftmodule.h
freetype/config/ftoption.h
freetype/config/ftstdlib.h
freetype/freetype.h
freetype/ftbbox.h
freetype/ftbdf.h
freetype/ftbitmap.h
freetype/ftcache.h
freetype/ftcid.h
freetype/fterrdef.h
freetype/fterrors.h
freetype/ftgasp.h
freetype/ftglyph.h
freetype/ftgxval.h
freetype/ftgzip.h
freetype/ftimage.h
freetype/ftincrem.h
freetype/ftlcdfil.h
freetype/ftlist.h
freetype/ftlzw.h
freetype/ftmac.h
freetype/ftmm.h
freetype/ftmodapi.h
freetype/ftmoderr.h
freetype/ftotval.h
freetype/ftoutln.h
freetype/ftpfr.h
freetype/ftrender.h
freetype/ftsizes.h
freetype/ftsnames.h
freetype/ftstroke.h
freetype/ftsynth.h
freetype/ftsystem.h
freetype/fttrigon.h
freetype/fttypes.h
freetype/ftwinfnt.h
freetype/ftxf86.h
freetype/t1tables.h
freetype/ttnameid.h
freetype/tttables.h
freetype/tttags.h
freetype/ttunpat.h
}

18
cocos2dx/textures/CCTexturePVR.cpp
View File

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