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

View File

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

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;