Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up SDL2 include paths 

Using "SDL2/SDL_xxx.h" instead of "SDL_xxx.h" caused
the include paths provided by pkg-config to be ignored,
and headers from a standard include path to be used instead.
This commit is contained in:
Jonas Kulla 2013-10-13 23:21:34 +02:00
parent 8b9c501249
commit 39436ad231
22 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binding-mri/binding-mri.cpp
View File

@ -29,7 +29,7 @@
#include "zlib.h" #include "zlib.h"
#include "SDL2/SDL_filesystem.h" #include "SDL_filesystem.h"
#include <QFile> #include <QFile>
#include <QByteArray> #include <QByteArray>

6
binding-mruby/binding-mruby.cpp
View File

@ -35,9 +35,9 @@
#include "stdio.h" #include "stdio.h"
#include "zlib.h" #include "zlib.h"
#include "SDL2/SDL_messagebox.h" #include "SDL_messagebox.h"
#include "SDL2/SDL_rwops.h" #include "SDL_rwops.h"
#include "SDL2/SDL_timer.h" #include "SDL_timer.h"
#include "sharedstate.h" #include "sharedstate.h"
#include "texpool.h" #include "texpool.h"

2
binding-mruby/mrb-ext/file.cpp
View File

@ -26,7 +26,7 @@
#include "mruby/array.h" #include "mruby/array.h"
#include "mruby/class.h" #include "mruby/class.h"
#include "SDL2/SDL_rwops.h" #include "SDL_rwops.h"
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>

2
binding-mruby/mrb-ext/file.h
View File

@ -24,7 +24,7 @@
#include "../binding-util.h" #include "../binding-util.h"
#include "SDL2/SDL_rwops.h" #include "SDL_rwops.h"
struct FileImpl struct FileImpl
{ {

2
binding-mruby/mrb-ext/kernel.cpp
View File

@ -26,7 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
#include "SDL2/SDL_messagebox.h" #include "SDL_messagebox.h"
#include "../binding-util.h" #include "../binding-util.h"
#include "marshal.h" #include "marshal.h"

2
binding-mruby/mrb-ext/marshal.cpp
View File

@ -38,7 +38,7 @@
#include "rwmem.h" #include "rwmem.h"
#include "exception.h" #include "exception.h"
#include "SDL2/SDL_timer.h" #include "SDL_timer.h"
#include <QVector> #include <QVector>
#include <QHash> #include <QHash>

2
binding-mruby/mrb-ext/marshal.h
View File

@ -23,7 +23,7 @@
#define MARSHAL_H #define MARSHAL_H
#include "mruby.h" #include "mruby.h"
#include "SDL2/SDL_rwops.h" #include "SDL_rwops.h"
void marshalDumpInt(mrb_state *, SDL_RWops *, mrb_value); void marshalDumpInt(mrb_state *, SDL_RWops *, mrb_value);
mrb_value marshalLoadInt(mrb_state *, SDL_RWops *); mrb_value marshalLoadInt(mrb_state *, SDL_RWops *);

2
binding-mruby/mrb-ext/rwmem.cpp
View File

@ -21,7 +21,7 @@
#include "rwmem.h" #include "rwmem.h"
#include "SDL2/SDL_rwops.h" #include "SDL_rwops.h"
#include <QVector> #include <QVector>
typedef QVector<char> ByteVec; typedef QVector<char> ByteVec;

4
src/audio.cpp
View File

@ -36,9 +36,9 @@
#include <QByteArray> #include <QByteArray>
#include <QHash> #include <QHash>
#include "SDL2/SDL_thread.h" #include "SDL_thread.h"
//#include "SDL2/SDL_mixer.h" //#include "SDL_mixer.h"
#include <QDebug> #include <QDebug>

8
src/bitmap.cpp
View File

@ -21,10 +21,10 @@
#include "bitmap.h" #include "bitmap.h"
#include "SDL2/SDL.h" #include "SDL.h"
#include "SDL2/SDL_image.h" #include "SDL_image.h"
#include "SDL2/SDL_ttf.h" #include "SDL_ttf.h"
#include "SDL2/SDL_rect.h" #include "SDL_rect.h"
#include "pixman.h" #include "pixman.h"

4
src/etc.cpp
View File

@ -24,8 +24,8 @@
#include "serial-util.h" #include "serial-util.h"
#include "exception.h" #include "exception.h"
#include "SDL2/SDL_types.h" #include "SDL_types.h"
#include "SDL2/SDL_pixels.h" #include "SDL_pixels.h"
Color::Color(double red, double green, double blue, double alpha) Color::Color(double red, double green, double blue, double alpha)
: red(red), green(green), blue(blue), alpha(alpha) : red(red), green(green), blue(blue), alpha(alpha)

10
src/eventthread.cpp
View File

@ -21,11 +21,11 @@
#include "eventthread.h" #include "eventthread.h"
#include "SDL2/SDL_events.h" #include "SDL_events.h"
#include "SDL2/SDL_joystick.h" #include "SDL_joystick.h"
#include "SDL2/SDL_messagebox.h" #include "SDL_messagebox.h"
#include "SDL2/SDL_timer.h" #include "SDL_timer.h"
#include "SDL2/SDL_thread.h" #include "SDL_thread.h"
#include "sharedstate.h" #include "sharedstate.h"
#include "graphics.h" #include "graphics.h"

8
src/eventthread.h
View File

@ -25,11 +25,11 @@
#include "config.h" #include "config.h"
#include "etc-internal.h" #include "etc-internal.h"
#include "SDL2/SDL_scancode.h" #include "SDL_scancode.h"
#include "SDL2/SDL_joystick.h" #include "SDL_joystick.h"
#include "SDL2/SDL_mouse.h" #include "SDL_mouse.h"
#include "SDL2/SDL_mutex.h" #include "SDL_mutex.h"
#include <QByteArray> #include <QByteArray>
#include <QVector> #include <QVector>

2
src/filesystem.h
View File

@ -24,7 +24,7 @@
#include "SFML/System/InputStream.hpp" #include "SFML/System/InputStream.hpp"
#include "SDL2/SDL_rwops.h" #include "SDL_rwops.h"
struct PHYSFS_File; struct PHYSFS_File;

2
src/font.cpp
View File

@ -27,7 +27,7 @@
#include "../liberation.ttf.xxd" #include "../liberation.ttf.xxd"
#include "SDL2/SDL_ttf.h" #include "SDL_ttf.h"
#include <QHash> #include <QHash>
#include <QByteArray> #include <QByteArray>

2
src/glstate.cpp
View File

@ -21,7 +21,7 @@
#include "glstate.h" #include "glstate.h"
#include "GL/glew.h" #include "GL/glew.h"
#include "SDL2/SDL_rect.h" #include "SDL_rect.h"
#include "etc.h" #include "etc.h"
void GLClearColor::apply(const Vec4 &value) void GLClearColor::apply(const Vec4 &value)

4
src/graphics.cpp
View File

@ -35,8 +35,8 @@
#include "binding.h" #include "binding.h"
#include "perftimer.h" #include "perftimer.h"
#include "SDL2/SDL_video.h" #include "SDL_video.h"
#include "SDL2/SDL_timer.h" #include "SDL_timer.h"
struct PingPong struct PingPong
{ {

4
src/input.cpp
View File

@ -25,8 +25,8 @@
#include "exception.h" #include "exception.h"
#include "util.h" #include "util.h"
#include "SDL2/SDL_scancode.h" #include "SDL_scancode.h"
#include "SDL2/SDL_mouse.h" #include "SDL_mouse.h"
#include <QVector> #include <QVector>
#include "string.h" #include "string.h"

6
src/main.cpp
View File

@ -21,9 +21,9 @@
#include "GL/glew.h" #include "GL/glew.h"
#include "SDL2/SDL.h" #include "SDL.h"
#include "SDL2/SDL_image.h" #include "SDL_image.h"
#include "SDL2/SDL_ttf.h" #include "SDL_ttf.h"
#include "sharedstate.h" #include "sharedstate.h"
#include "eventthread.h" #include "eventthread.h"

2
src/perftimer.cpp
View File

@ -1,6 +1,6 @@
#include "perftimer.h" #include "perftimer.h"
#include "SDL2/SDL_timer.h" #include "SDL_timer.h"
#include "GL/glew.h" #include "GL/glew.h"
#include <QDebug> #include <QDebug>

2
src/tilemap.cpp
View File

@ -41,7 +41,7 @@
#include <QVector> #include <QVector>
#include <SDL2/SDL_surface.h> #include "SDL_surface.h"
extern const StaticRect autotileRects[]; extern const StaticRect autotileRects[];

2
src/viewport.cpp
View File

@ -27,7 +27,7 @@
#include "quad.h" #include "quad.h"
#include "glstate.h" #include "glstate.h"
#include "SDL2/SDL_rect.h" #include "SDL_rect.h"
#include "sigc++/connection.h" #include "sigc++/connection.h"