#1683: Add prefix SDL/ for header inclusion in lib/framework/types.h, for
consistency + mingw wont compile otherwise
-------------------------------------+--------------------------------------
Reporter: bornemix | Type: bug
Status: new | Priority: major
Milestone: 2.3 | Component: other
Version: unspecified | Keywords:
Operating_system: All/Non-Specific | Blockedby:
Blocking: |
-------------------------------------+--------------------------------------
It seems other compilers find this automatically in SDL/. Not MINGW on my
machine.
The SDL headers are sometimes included with SDL/ (3 times in source), and
sometimes without, so it seems best to add it in all cases.
Any discrepancies in the devpkgs should be changed correspondingly, but I
think that there are none.
Also, other libraries are included with their containing folder specified:
#include <OpenGL/glu.h>
...
#include <GL/glu.h>
(example taken from trunk/tools/pietoaster/texture.cpp)
FILES THAT INCLUDE SDL HEADERS WITHOUT SPECIFYING CONTAINING FOLDER
{{{
trunk/lib/betawidget/src/platform/sdl/event.h (1 hits)
Line 24: #include <SDL.h>
trunk/lib/framework/types.h (1 hits)
Line 34: #include <SDL_stdinc.h>
trunk/tools/display/wzmviewer.h (2 hits)
Line 42: #include <SDL.h>
Line 43: #include <SDL_opengl.h>
trunk/tools/pietoaster/base_types.h (1 hits)
Line 23: #include <SDL.h>
trunk/tools/pietoaster/game_io.h (1 hits)
Line 22: #include <SDL.h>
trunk/tools/pietoaster/pietoaster.cpp (1 hits)
Line 27: #include <SDL_opengl.h>
trunk/tools/pietoaster/pie_internal.cpp (1 hits)
Line 22: #include <SDL_opengl.h>
trunk/tools/pietoaster/resmaster.cpp (2 hits)
Line 22: #include <SDL_opengl.h>
Line 23: #include <SDL_image.h>
trunk/tools/pietoaster/resmaster.h (1 hits)
Line 23: #include <SDL_opengl.h>
trunk/tools/pietoaster/screen.h (1 hits)
Line 23: #include <SDL_opengl.h>
trunk/tools/pietoaster/texture.cpp (1 hits)
Line 21: #include <SDL_opengl.h>
}}}
FILES THAT INCLUDE SDL HEADERS WITH CONTAINING FOLDER
{{{
trunk/lib/framework/cursors.h (1 hits)
Line 27: #include <SDL/SDL_mouse.h>
trunk/lib/framework/input.h (1 hits)
Line 33: #include <SDL/SDL.h>
trunk/lib/framework/SDL_framerate.h (1 hits)
Line 20: #include <SDL/SDL.h>
}}}
**********This patch adds SDL/ (which is the containing folder, located in
devpkg for mingw) to the first group of files.**********
The change is implemented like so:
BEFORE:
#include <SDL_stdinc.h>
AFTER:
#include <SDL/SDL_stdinc.h>
--
Ticket URL: <http://developer.wz2100.net/ticket/1683>
Warzone 2100 Trac <http://developer.wz2100.net/>
The Warzone 2100 Project
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
