From 39436ad2317387c259f028dd124d006eef0acb83 Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Sun, 13 Oct 2013 23:21:34 +0200 Subject: [PATCH] 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. --- binding-mri/binding-mri.cpp | 2 +- binding-mruby/binding-mruby.cpp | 6 +++--- binding-mruby/mrb-ext/file.cpp | 2 +- binding-mruby/mrb-ext/file.h | 2 +- binding-mruby/mrb-ext/kernel.cpp | 2 +- binding-mruby/mrb-ext/marshal.cpp | 2 +- binding-mruby/mrb-ext/marshal.h | 2 +- binding-mruby/mrb-ext/rwmem.cpp | 2 +- src/audio.cpp | 4 ++-- src/bitmap.cpp | 8 ++++---- src/etc.cpp | 4 ++-- src/eventthread.cpp | 10 +++++----- src/eventthread.h | 8 ++++---- src/filesystem.h | 2 +- src/font.cpp | 2 +- src/glstate.cpp | 2 +- src/graphics.cpp | 4 ++-- src/input.cpp | 4 ++-- src/main.cpp | 6 +++--- src/perftimer.cpp | 2 +- src/tilemap.cpp | 2 +- src/viewport.cpp | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp index 85c437f..9dc9331 100644 --- a/binding-mri/binding-mri.cpp +++ b/binding-mri/binding-mri.cpp @@ -29,7 +29,7 @@ #include "zlib.h" -#include "SDL2/SDL_filesystem.h" +#include "SDL_filesystem.h" #include #include diff --git a/binding-mruby/binding-mruby.cpp b/binding-mruby/binding-mruby.cpp index 5834892..70d7433 100644 --- a/binding-mruby/binding-mruby.cpp +++ b/binding-mruby/binding-mruby.cpp @@ -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" diff --git a/binding-mruby/mrb-ext/file.cpp b/binding-mruby/mrb-ext/file.cpp index c31c00c..2694582 100644 --- a/binding-mruby/mrb-ext/file.cpp +++ b/binding-mruby/mrb-ext/file.cpp @@ -26,7 +26,7 @@ #include "mruby/array.h" #include "mruby/class.h" -#include "SDL2/SDL_rwops.h" +#include "SDL_rwops.h" #include #include diff --git a/binding-mruby/mrb-ext/file.h b/binding-mruby/mrb-ext/file.h index 5d35277..34b8967 100644 --- a/binding-mruby/mrb-ext/file.h +++ b/binding-mruby/mrb-ext/file.h @@ -24,7 +24,7 @@ #include "../binding-util.h" -#include "SDL2/SDL_rwops.h" +#include "SDL_rwops.h" struct FileImpl { diff --git a/binding-mruby/mrb-ext/kernel.cpp b/binding-mruby/mrb-ext/kernel.cpp index 9831ab7..9958397 100644 --- a/binding-mruby/mrb-ext/kernel.cpp +++ b/binding-mruby/mrb-ext/kernel.cpp @@ -26,7 +26,7 @@ #include #include -#include "SDL2/SDL_messagebox.h" +#include "SDL_messagebox.h" #include "../binding-util.h" #include "marshal.h" diff --git a/binding-mruby/mrb-ext/marshal.cpp b/binding-mruby/mrb-ext/marshal.cpp index 62b08f7..afc5076 100644 --- a/binding-mruby/mrb-ext/marshal.cpp +++ b/binding-mruby/mrb-ext/marshal.cpp @@ -38,7 +38,7 @@ #include "rwmem.h" #include "exception.h" -#include "SDL2/SDL_timer.h" +#include "SDL_timer.h" #include #include diff --git a/binding-mruby/mrb-ext/marshal.h b/binding-mruby/mrb-ext/marshal.h index 4af4d7b..161f86d 100644 --- a/binding-mruby/mrb-ext/marshal.h +++ b/binding-mruby/mrb-ext/marshal.h @@ -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 *); diff --git a/binding-mruby/mrb-ext/rwmem.cpp b/binding-mruby/mrb-ext/rwmem.cpp index 8290f07..3a0f41a 100644 --- a/binding-mruby/mrb-ext/rwmem.cpp +++ b/binding-mruby/mrb-ext/rwmem.cpp @@ -21,7 +21,7 @@ #include "rwmem.h" -#include "SDL2/SDL_rwops.h" +#include "SDL_rwops.h" #include typedef QVector ByteVec; diff --git a/src/audio.cpp b/src/audio.cpp index 4dbe73f..da9a23b 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -36,9 +36,9 @@ #include #include -#include "SDL2/SDL_thread.h" +#include "SDL_thread.h" -//#include "SDL2/SDL_mixer.h" +//#include "SDL_mixer.h" #include diff --git a/src/bitmap.cpp b/src/bitmap.cpp index 19c0e79..0f056dc 100644 --- a/src/bitmap.cpp +++ b/src/bitmap.cpp @@ -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" diff --git a/src/etc.cpp b/src/etc.cpp index 7a74872..3835fc6 100644 --- a/src/etc.cpp +++ b/src/etc.cpp @@ -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) diff --git a/src/eventthread.cpp b/src/eventthread.cpp index de69d14..babf7e0 100644 --- a/src/eventthread.cpp +++ b/src/eventthread.cpp @@ -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" diff --git a/src/eventthread.h b/src/eventthread.h index c079271..a8016d3 100644 --- a/src/eventthread.h +++ b/src/eventthread.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 #include diff --git a/src/filesystem.h b/src/filesystem.h index 74e1577..ecb12bf 100644 --- a/src/filesystem.h +++ b/src/filesystem.h @@ -24,7 +24,7 @@ #include "SFML/System/InputStream.hpp" -#include "SDL2/SDL_rwops.h" +#include "SDL_rwops.h" struct PHYSFS_File; diff --git a/src/font.cpp b/src/font.cpp index b80057e..b7c07f0 100644 --- a/src/font.cpp +++ b/src/font.cpp @@ -27,7 +27,7 @@ #include "../liberation.ttf.xxd" -#include "SDL2/SDL_ttf.h" +#include "SDL_ttf.h" #include #include diff --git a/src/glstate.cpp b/src/glstate.cpp index 011eb24..031a031 100644 --- a/src/glstate.cpp +++ b/src/glstate.cpp @@ -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) diff --git a/src/graphics.cpp b/src/graphics.cpp index 9d73306..7dc3db2 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -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 { diff --git a/src/input.cpp b/src/input.cpp index 1776a04..a7f96ea 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -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 #include "string.h" diff --git a/src/main.cpp b/src/main.cpp index fae508e..764d2fb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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" diff --git a/src/perftimer.cpp b/src/perftimer.cpp index 2ec1ece..29100ad 100644 --- a/src/perftimer.cpp +++ b/src/perftimer.cpp @@ -1,6 +1,6 @@ #include "perftimer.h" -#include "SDL2/SDL_timer.h" +#include "SDL_timer.h" #include "GL/glew.h" #include diff --git a/src/tilemap.cpp b/src/tilemap.cpp index 004934f..08d9109 100644 --- a/src/tilemap.cpp +++ b/src/tilemap.cpp @@ -41,7 +41,7 @@ #include -#include +#include "SDL_surface.h" extern const StaticRect autotileRects[]; diff --git a/src/viewport.cpp b/src/viewport.cpp index 7d9966e..19d94ae 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -27,7 +27,7 @@ #include "quad.h" #include "glstate.h" -#include "SDL2/SDL_rect.h" +#include "SDL_rect.h" #include "sigc++/connection.h"