Merge branch 'master' of github.com:Allanis/Lephisto

This commit is contained in:
Allanis 2013-06-23 15:25:03 +01:00
commit 118aba3b3c
2 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,5 @@
#include <SDL.h>
#include <SDL_image.h>
#include <SDL/SDL.h>
#include <SDL/SDL_image.h>
#include <png.h>
#include <ft2build.h>
#include <freetype/freetype.h>

View File

@ -2,8 +2,8 @@
#include <malloc.h>
#include <png.h>
#include "SDL.h"
#include "SDL_image.h"
#include <SDL/SDL.h>
#include <SDL/SDL_image.h>
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
# define RMASK 0xff000000