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:
parent
8b9c501249
commit
39436ad231
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include "zlib.h"
|
||||
|
||||
#include "SDL2/SDL_filesystem.h"
|
||||
#include "SDL_filesystem.h"
|
||||
|
||||
#include <QFile>
|
||||
#include <QByteArray>
|
||||
|
|
|
@ -35,9 +35,9 @@
|
|||
#include "stdio.h"
|
||||
#include "zlib.h"
|
||||
|
||||
#include "SDL2/SDL_messagebox.h"
|
||||
#include "SDL2/SDL_rwops.h"
|
||||
#include "SDL2/SDL_timer.h"
|
||||
#include "SDL_messagebox.h"
|
||||
#include "SDL_rwops.h"
|
||||
#include "SDL_timer.h"
|
||||
|
||||
#include "sharedstate.h"
|
||||
#include "texpool.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "mruby/array.h"
|
||||
#include "mruby/class.h"
|
||||
|
||||
#include "SDL2/SDL_rwops.h"
|
||||
#include "SDL_rwops.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "../binding-util.h"
|
||||
|
||||
#include "SDL2/SDL_rwops.h"
|
||||
#include "SDL_rwops.h"
|
||||
|
||||
struct FileImpl
|
||||
{
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "SDL2/SDL_messagebox.h"
|
||||
#include "SDL_messagebox.h"
|
||||
|
||||
#include "../binding-util.h"
|
||||
#include "marshal.h"
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include "rwmem.h"
|
||||
#include "exception.h"
|
||||
|
||||
#include "SDL2/SDL_timer.h"
|
||||
#include "SDL_timer.h"
|
||||
|
||||
#include <QVector>
|
||||
#include <QHash>
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#define MARSHAL_H
|
||||
|
||||
#include "mruby.h"
|
||||
#include "SDL2/SDL_rwops.h"
|
||||
#include "SDL_rwops.h"
|
||||
|
||||
void marshalDumpInt(mrb_state *, SDL_RWops *, mrb_value);
|
||||
mrb_value marshalLoadInt(mrb_state *, SDL_RWops *);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "rwmem.h"
|
||||
|
||||
#include "SDL2/SDL_rwops.h"
|
||||
#include "SDL_rwops.h"
|
||||
#include <QVector>
|
||||
|
||||
typedef QVector<char> ByteVec;
|
||||
|
|
|
@ -36,9 +36,9 @@
|
|||
#include <QByteArray>
|
||||
#include <QHash>
|
||||
|
||||
#include "SDL2/SDL_thread.h"
|
||||
#include "SDL_thread.h"
|
||||
|
||||
//#include "SDL2/SDL_mixer.h"
|
||||
//#include "SDL_mixer.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
|
|
|
@ -21,10 +21,10 @@
|
|||
|
||||
#include "bitmap.h"
|
||||
|
||||
#include "SDL2/SDL.h"
|
||||
#include "SDL2/SDL_image.h"
|
||||
#include "SDL2/SDL_ttf.h"
|
||||
#include "SDL2/SDL_rect.h"
|
||||
#include "SDL.h"
|
||||
#include "SDL_image.h"
|
||||
#include "SDL_ttf.h"
|
||||
#include "SDL_rect.h"
|
||||
|
||||
#include "pixman.h"
|
||||
|
||||
|
|
|
@ -24,8 +24,8 @@
|
|||
#include "serial-util.h"
|
||||
#include "exception.h"
|
||||
|
||||
#include "SDL2/SDL_types.h"
|
||||
#include "SDL2/SDL_pixels.h"
|
||||
#include "SDL_types.h"
|
||||
#include "SDL_pixels.h"
|
||||
|
||||
Color::Color(double red, double green, double blue, double alpha)
|
||||
: red(red), green(green), blue(blue), alpha(alpha)
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
#include "eventthread.h"
|
||||
|
||||
#include "SDL2/SDL_events.h"
|
||||
#include "SDL2/SDL_joystick.h"
|
||||
#include "SDL2/SDL_messagebox.h"
|
||||
#include "SDL2/SDL_timer.h"
|
||||
#include "SDL2/SDL_thread.h"
|
||||
#include "SDL_events.h"
|
||||
#include "SDL_joystick.h"
|
||||
#include "SDL_messagebox.h"
|
||||
#include "SDL_timer.h"
|
||||
#include "SDL_thread.h"
|
||||
|
||||
#include "sharedstate.h"
|
||||
#include "graphics.h"
|
||||
|
|
|
@ -25,11 +25,11 @@
|
|||
#include "config.h"
|
||||
#include "etc-internal.h"
|
||||
|
||||
#include "SDL2/SDL_scancode.h"
|
||||
#include "SDL2/SDL_joystick.h"
|
||||
#include "SDL2/SDL_mouse.h"
|
||||
#include "SDL_scancode.h"
|
||||
#include "SDL_joystick.h"
|
||||
#include "SDL_mouse.h"
|
||||
|
||||
#include "SDL2/SDL_mutex.h"
|
||||
#include "SDL_mutex.h"
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QVector>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "SFML/System/InputStream.hpp"
|
||||
|
||||
#include "SDL2/SDL_rwops.h"
|
||||
#include "SDL_rwops.h"
|
||||
|
||||
struct PHYSFS_File;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "../liberation.ttf.xxd"
|
||||
|
||||
#include "SDL2/SDL_ttf.h"
|
||||
#include "SDL_ttf.h"
|
||||
|
||||
#include <QHash>
|
||||
#include <QByteArray>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "glstate.h"
|
||||
#include "GL/glew.h"
|
||||
#include "SDL2/SDL_rect.h"
|
||||
#include "SDL_rect.h"
|
||||
#include "etc.h"
|
||||
|
||||
void GLClearColor::apply(const Vec4 &value)
|
||||
|
|
|
@ -35,8 +35,8 @@
|
|||
#include "binding.h"
|
||||
#include "perftimer.h"
|
||||
|
||||
#include "SDL2/SDL_video.h"
|
||||
#include "SDL2/SDL_timer.h"
|
||||
#include "SDL_video.h"
|
||||
#include "SDL_timer.h"
|
||||
|
||||
struct PingPong
|
||||
{
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
#include "exception.h"
|
||||
#include "util.h"
|
||||
|
||||
#include "SDL2/SDL_scancode.h"
|
||||
#include "SDL2/SDL_mouse.h"
|
||||
#include "SDL_scancode.h"
|
||||
#include "SDL_mouse.h"
|
||||
|
||||
#include <QVector>
|
||||
#include "string.h"
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
#include "GL/glew.h"
|
||||
|
||||
#include "SDL2/SDL.h"
|
||||
#include "SDL2/SDL_image.h"
|
||||
#include "SDL2/SDL_ttf.h"
|
||||
#include "SDL.h"
|
||||
#include "SDL_image.h"
|
||||
#include "SDL_ttf.h"
|
||||
|
||||
#include "sharedstate.h"
|
||||
#include "eventthread.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "perftimer.h"
|
||||
|
||||
#include "SDL2/SDL_timer.h"
|
||||
#include "SDL_timer.h"
|
||||
#include "GL/glew.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include <QVector>
|
||||
|
||||
#include <SDL2/SDL_surface.h>
|
||||
#include "SDL_surface.h"
|
||||
|
||||
extern const StaticRect autotileRects[];
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "quad.h"
|
||||
#include "glstate.h"
|
||||
|
||||
#include "SDL2/SDL_rect.h"
|
||||
#include "SDL_rect.h"
|
||||
|
||||
#include "sigc++/connection.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue