Merged the specifics of Caanoo 1.2 port by Pheel + Enabled TTF text on Caanoo

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1645 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2010-11-05 01:03:11 +00:00
parent a59de659bd
commit 7a3ae5824a
12 changed files with 29 additions and 19 deletions

View File

@@ -36,16 +36,16 @@
#include <SDL_ttf.h>
#endif
#if defined(__linux__)
#if defined(__macosx__)
#if defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)
// No X11
#elif defined(__macosx__)
#include <Carbon/Carbon.h>
#import <corefoundation/corefoundation.h>
#import <sys/param.h>
#else
#elif defined(__linux__)
#include <X11/Xlib.h>
#endif
#endif
#endif
#include <SDL_image.h>
#include "SFont.h"
@@ -321,6 +321,8 @@ void Init_text(void)
CFRelease(url);
#endif
#elif defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)
// No X11 : Only use fonts from Grafx2
#elif defined(__linux__)
#ifndef NOTTF
#define USE_XLIB