build: reorganise includes so that we can use precompiled headers later.

10 years ago · cd988786b9
--- a/demos/test/benchmark/half.cpp
+++ b/demos/test/benchmark/half.cpp
@@ -8,13 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cstdio>

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/test/benchmark/real.cpp
+++ b/demos/test/benchmark/real.cpp
@@ -8,13 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cstdio>

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/test/benchmark/trig.cpp
+++ b/demos/test/benchmark/trig.cpp
@@ -18,7 +18,7 @@
 #   include <fastmath.h>
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/test/benchmark/vector.cpp
+++ b/demos/test/benchmark/vector.cpp
@@ -8,13 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cstdio>

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/test/benchsuite.cpp
+++ b/demos/test/benchsuite.cpp
@@ -8,13 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cstdio>

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/test/btphystest.cpp
+++ b/demos/test/btphystest.cpp
@@ -5,11 +5,11 @@
 //            (c) 2012-2013 Sam Hocevar <sam@hocevar.net>
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/test/generated/scenesetup-parser.cpp
+++ b/demos/test/generated/scenesetup-parser.cpp
@@ -49,11 +49,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "../scenesetup.h"


--- a/demos/test/generated/scenesetup-scanner.cpp
+++ b/demos/test/generated/scenesetup-scanner.cpp
@@ -494,7 +494,7 @@ static yyconst flex_int16_t yy_chk[180] =
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

@@ -504,7 +504,7 @@ using std::malloc;
 using std::realloc;
 using std::free;

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "../scenesetup.h"
 #include "../scenesetup-compiler.h"

--- a/demos/test/math/pi.cpp
+++ b/demos/test/math/pi.cpp
@@ -8,13 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cstdio>

 #include <lol/main.h>
 #include <lol/engine.h>

 using std::printf;
 using std::sqrt;
--- a/demos/test/math/poly.cpp
+++ b/demos/test/math/poly.cpp
@@ -8,13 +8,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cstdio>

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/test/meshviewer.cpp
+++ b/demos/test/meshviewer.cpp
@@ -10,13 +10,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cfloat> /* for FLT_MAX */

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "scenesetup.h"

 using namespace lol;
--- a/demos/test/nacl_phystest.cpp
+++ b/demos/test/nacl_phystest.cpp
@@ -5,11 +5,11 @@
 //            (c) 2012-2013 Sam Hocevar <sam@hocevar.net>
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/test/physicobject.h
+++ b/demos/test/physicobject.h
@@ -11,7 +11,7 @@
 #if !defined __PHYSICOBJECT_H__
 #define __PHYSICOBJECT_H__

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "easymesh/easymesh.h"
 #include "physics/easyphysics.h"
 #include "physics/easycharactercontroller.h"
--- a/demos/test/physics/bulletcharactercontroller.cpp
+++ b/demos/test/physics/bulletcharactercontroller.cpp
@@ -10,13 +10,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #define USE_LOL_CTRLR_CHARAC

 #include <lol/main.h>
 #include <lol/engine.h>
 #include <stdio.h>
 #include "lolbtphysicsintegration.h"
 #include "lolphysics.h"
--- a/demos/test/physics/bulletcharactercontroller.h
+++ b/demos/test/physics/bulletcharactercontroller.h
@@ -18,7 +18,7 @@
 #if !defined __BULLETCHARACTERCONTROLLER_BULLETCHARACTERCONTROLLER_H__
 #define __BULLETCHARACTERCONTROLLER_BULLETCHARACTERCONTROLLER_H__

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "easyphysics.h"
 //#include "BulletDynamics\Character\btCharacterControllerInterface.h"

--- a/demos/test/physics/easycharactercontroller.cpp
+++ b/demos/test/physics/easycharactercontroller.cpp
@@ -10,7 +10,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

--- a/demos/test/physics/easycharactercontroller.h
+++ b/demos/test/physics/easycharactercontroller.h
@@ -20,7 +20,7 @@
 #if !defined __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__
 #define __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "easyphysics.h"
 #include "bulletcharactercontroller.h"
 #include <BulletDynamics/Character/btKinematicCharacterController.h>
--- a/demos/test/physics/easyconstraint.cpp
+++ b/demos/test/physics/easyconstraint.cpp
@@ -1,5 +1,5 @@

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

--- a/demos/test/physics/easyconstraint.h
+++ b/demos/test/physics/easyconstraint.h
@@ -17,7 +17,7 @@
 #if !defined __EASYCONSTRAINT_EASYCONSTRAINT_H__
 #define __EASYCONSTRAINT_EASYCONSTRAINT_H__

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "easyphysics.h"

 namespace lol
--- a/demos/test/physics/easyphysics.cpp
+++ b/demos/test/physics/easyphysics.cpp
@@ -10,7 +10,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

--- a/demos/test/physics/easyphysics.h
+++ b/demos/test/physics/easyphysics.h
@@ -17,7 +17,7 @@
 #if !defined __EASYPHYSICS_EASYPHYSICS_H__
 #define __EASYPHYSICS_EASYPHYSICS_H__

 #include <lol/main.h>
 #include <lol/engine.h>
 #include <bullet/btBulletDynamicsCommon.h>
 #include <bullet/btBulletCollisionCommon.h>
 #include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
--- a/demos/test/sandbox/sample.cpp
+++ b/demos/test/sandbox/sample.cpp
@@ -8,11 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/test/scenesetup-compiler.cpp
+++ b/demos/test/scenesetup-compiler.cpp
@@ -9,13 +9,13 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <string>

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "scenesetup.h"
 #include "scenesetup-compiler.h"

--- a/demos/test/scenesetup.cpp
+++ b/demos/test/scenesetup.cpp
@@ -9,11 +9,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "scenesetup.h"
 #include "scenesetup-compiler.h"

--- a/demos/tutorial/01_triangle.cpp
+++ b/demos/tutorial/01_triangle.cpp
@@ -8,11 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/tutorial/02_cube.cpp
+++ b/demos/tutorial/02_cube.cpp
@@ -8,11 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/tutorial/03_noise.cpp
+++ b/demos/tutorial/03_noise.cpp
@@ -8,11 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/tutorial/04_texture.cpp
+++ b/demos/tutorial/04_texture.cpp
@@ -8,11 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/tutorial/05_easymesh.cpp
+++ b/demos/tutorial/05_easymesh.cpp
@@ -9,11 +9,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/tutorial/06_sprite.cpp
+++ b/demos/tutorial/06_sprite.cpp
@@ -9,11 +9,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>

 using namespace lol;

--- a/demos/tutorial/07_input.cpp
+++ b/demos/tutorial/07_input.cpp
@@ -8,11 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/tutorial/08_fbo.cpp
+++ b/demos/tutorial/08_fbo.cpp
@@ -8,11 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/tutorial/11_fractal.cpp
+++ b/demos/tutorial/11_fractal.cpp
@@ -8,14 +8,14 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <cstring>
 #include <cstdio>

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/demos/tutorial/12_voronoi.cpp
+++ b/demos/tutorial/12_voronoi.cpp
@@ -9,11 +9,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine.h>
 #include "loldebug.h"

 using namespace lol;
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,13 +26,14 @@ liblolcore_a_SOURCES = \
    $(sdl_sources) \
    $(d3d9_sources) \
    $(android_sources)
 #liblolcore_a_CPPFLAGS = -include-pch $(srcdir)/lol/engine-internal.h.pch $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
 liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua

 EXTRA_DIST += easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \
              gpu/lolfx-scanner.l gpu/lolfx-parser.y

 liblolcore_headers = \
    lol/main.h lol/engine.h lol/extras.h \
    lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \
    \
    lol/base/all.h \
    lol/base/features.h lol/base/tuple.h lol/base/types.h lol/base/array.h \
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -8,16 +8,12 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if HAVE_EMSCRIPTEN_H
 #   include <emscripten.h>
 #endif

 #include <lol/main.h>

 #include "lolgl.h"

 #if __CELLOS_LV2__
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined USE_SDL_MIXER
 #   if defined HAVE_SDL_SDL_H
@@ -25,8 +23,6 @@
 #   endif
 #endif

 #include <lol/main.h>

 namespace lol
 {

--- a/src/base/assert.cpp
+++ b/src/base/assert.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if HAVE_CXXABI_H
 #   include <cxxabi.h>
@@ -23,8 +21,6 @@
 #   include <emscripten.h>
 #endif

 #include <lol/main.h>

 namespace lol
 {

--- a/src/base/enum.cpp
+++ b/src/base/enum.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/base/hash.cpp
+++ b/src/base/hash.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/base/log.cpp
+++ b/src/base/log.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined(HAVE_CONFIG_H)
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdio>

@@ -26,8 +24,6 @@
 #   include <cstdarg>
 #endif

 #include <lol/main.h>

 namespace lol
 {

--- a/src/base/string.cpp
+++ b/src/base/string.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdio>

@@ -21,8 +19,6 @@

 #include <cstdarg>

 #include <lol/main.h>

 namespace lol
 {

--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -9,15 +9,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstring>
 #include <cstdlib>

 #include <lol/main.h>

 #if defined _WIN32 || defined _XBOX
 #   define strcasecmp _stricmp
 #   undef near
--- a/src/debug/fps.cpp
+++ b/src/debug/fps.cpp
@@ -8,13 +8,10 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdio>

 #include <lol/main.h>
 #include "loldebug.h"

 namespace lol
--- a/src/debug/lines.cpp
+++ b/src/debug/lines.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/debug/record.cpp
+++ b/src/debug/record.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstring>

@@ -18,7 +16,6 @@
 #   include <pipi.h>
 #endif

 #include <lol/main.h>
 #include "loldebug.h"

 namespace lol
--- a/src/debug/stats.cpp
+++ b/src/debug/stats.cpp
@@ -8,13 +8,10 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdio>

 #include <lol/main.h>
 #include "loldebug.h"

 namespace lol
--- a/src/dict.cpp
+++ b/src/dict.cpp
@@ -8,15 +8,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstring>
 #include <cstdlib>

 #include <lol/main.h>

 #if defined _WIN32 || defined _XBOX
 #   define strcasecmp _stricmp
 #endif
--- a/src/easymesh/csgbsp.cpp
+++ b/src/easymesh/csgbsp.cpp
@@ -14,12 +14,7 @@
 // ------------------
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/math/geometry.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/easymesh/easymesh-compiler.cpp
+++ b/src/easymesh/easymesh-compiler.cpp
@@ -10,13 +10,10 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <string>

 #include <lol/main.h>
 #include "easymesh/easymesh-compiler.h"

 namespace lol
--- a/src/easymesh/easymesh.cpp
+++ b/src/easymesh/easymesh.cpp
@@ -15,11 +15,8 @@
 // ------------------
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "easymesh/easymesh-compiler.h"

 LOLFX_RESOURCE_DECLARE(shiny);
--- a/src/easymesh/easymeshbuild.cpp
+++ b/src/easymesh/easymeshbuild.cpp
@@ -15,11 +15,7 @@
 // ------------------
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/easymesh/easymeshrender.cpp
+++ b/src/easymesh/easymeshrender.cpp
@@ -15,11 +15,7 @@
 // ------------------
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/eglapp.cpp
+++ b/src/eglapp.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined USE_EGL && !defined __ANDROID__
 #   if defined HAVE_BCM_HOST_H
@@ -32,7 +30,6 @@
 #   endif
 #endif

 #include <lol/main.h>
 #include "lolgl.h"
 #include "eglapp.h"
 #if defined USE_SDL
--- a/src/emitter.cpp
+++ b/src/emitter.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -8,14 +8,10 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdlib>

 #include <lol/main.h>

 namespace lol
 {

--- a/src/font.cpp
+++ b/src/font.cpp
@@ -9,15 +9,11 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstring>
 #include <cstdio>

 #include <lol/main.h>

 namespace lol
 {

--- a/src/forge.cpp
+++ b/src/forge.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/generated/easymesh-parser.cpp
+++ b/src/generated/easymesh-parser.cpp
@@ -50,11 +50,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "easymesh/easymesh.h"

 #include <string>
--- a/src/generated/easymesh-scanner.cpp
+++ b/src/generated/easymesh-scanner.cpp
@@ -658,9 +658,7 @@ static yyconst flex_int16_t yy_chk[502] =
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdlib>
 using std::exit;
@@ -668,7 +666,6 @@ using std::malloc;
 using std::realloc;
 using std::free;

 #include <lol/main.h>
 #include "easymesh/easymesh-compiler.h"

 typedef lol::EasyMeshParser::token token;
--- a/src/generated/lolfx-parser.cpp
+++ b/src/generated/lolfx-parser.cpp
@@ -48,11 +48,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 #include <string>

--- a/src/generated/lolfx-scanner.cpp
+++ b/src/generated/lolfx-scanner.cpp
@@ -1661,9 +1661,7 @@ static yyconst flex_int16_t yy_chk[3114] =
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdlib>
 using std::exit;
@@ -1672,7 +1670,6 @@ using std::realloc;
 using std::free;
 #include <iostream>

 #include <lol/main.h>
 #include "gpu/lolfx-compiler.h"

 typedef lol::LolFxParser::token token;
--- a/src/gpu/framebuffer.cpp
+++ b/src/gpu/framebuffer.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "lolgl.h"

 #if defined _WIN32 && defined USE_D3D9
--- a/src/gpu/indexbuffer.cpp
+++ b/src/gpu/indexbuffer.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "lolgl.h"

 #if defined _WIN32 && defined USE_D3D9
--- a/src/gpu/lolfx-compiler.cpp
+++ b/src/gpu/lolfx-compiler.cpp
@@ -8,13 +8,10 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <string>

 #include <lol/main.h>
 #include "gpu/lolfx-compiler.h"

 namespace lol
--- a/src/gpu/lolfx.cpp
+++ b/src/gpu/lolfx.cpp
@@ -13,11 +13,8 @@
 // ---------------
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "gpu/lolfx-compiler.h"

 namespace lol
--- a/src/gpu/rendercontext.cpp
+++ b/src/gpu/rendercontext.cpp
@@ -8,14 +8,10 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdlib>

 #include <lol/main.h>

 namespace lol
 {

--- a/src/gpu/renderer.cpp
+++ b/src/gpu/renderer.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstdlib>

@@ -28,7 +26,6 @@
 #   undef far /* Fuck Microsoft again */
 #endif

 #include <lol/main.h>
 #include "lolgl.h"

 /* FIXME: find a way to pass g_hwnd from the windowing system */
--- a/src/gpu/shader.cpp
+++ b/src/gpu/shader.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cstring>
 #include <cstdio>
@@ -31,7 +29,6 @@
 #   undef far /* Fuck Microsoft again */
 #endif

 #include <lol/main.h>
 #include "lolgl.h"

 namespace lol
--- a/src/gpu/texture.cpp
+++ b/src/gpu/texture.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "lolgl.h"

 #if defined _WIN32 && defined USE_D3D9
--- a/src/gpu/vertexbuffer.cpp
+++ b/src/gpu/vertexbuffer.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "lolgl.h"

 #if defined _WIN32 && defined USE_D3D9
--- a/src/gradient.cpp
+++ b/src/gradient.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 LOLFX_RESOURCE_DECLARE(gradient);

--- a/src/image/codec/android-image.cpp
+++ b/src/image/codec/android-image.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined __ANDROID__

@@ -21,7 +19,6 @@ extern "C" {
 #include <android_native_app_glue.h>
 }

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/dummy-image.cpp
+++ b/src/image/codec/dummy-image.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/gdiplus-image.cpp
+++ b/src/image/codec/gdiplus-image.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined USE_GDIPLUS

@@ -21,7 +19,6 @@ using std::max;
 #include <windows.h>
 #include <gdiplus.h>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/imlib2-image.cpp
+++ b/src/image/codec/imlib2-image.cpp
@@ -8,15 +8,12 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined USE_IMLIB2

 #include <Imlib2.h>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/ios-image.cpp
+++ b/src/image/codec/ios-image.cpp
@@ -8,15 +8,12 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined __APPLE__ && defined __MACH__ && defined __arm__

 #import <UIKit/UIKit.h>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/oric-image.cpp
+++ b/src/image/codec/oric-image.cpp
@@ -8,13 +8,10 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <cctype>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/ps3-image.cpp
+++ b/src/image/codec/ps3-image.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined __CELLOS_LV2__

@@ -18,7 +16,6 @@
 #include <cell/sysmodule.h>
 #include <cell/codec/pngdec.h>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/sdl-image.cpp
+++ b/src/image/codec/sdl-image.cpp
@@ -8,9 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #if defined USE_SDL_IMAGE

@@ -25,7 +23,6 @@
 #   include <SDL_image.h>
 #endif

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/zed-image.cpp
+++ b/src/image/codec/zed-image.cpp
@@ -9,11 +9,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/codec/zed-palette-image.cpp
+++ b/src/image/codec/zed-palette-image.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "../../image/image-private.h"

 namespace lol
--- a/src/image/color/cie1931.cpp
+++ b/src/image/color/cie1931.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * This file contains code and data related to various CIE standards.
--- a/src/image/color/color.cpp
+++ b/src/image/color/color.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 namespace lol
 {
--- a/src/image/combine.cpp
+++ b/src/image/combine.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Image merge operations: merge, min/max, overlay, screen, multiply,
--- a/src/image/crop.cpp
+++ b/src/image/crop.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "image-private.h"

 /*
--- a/src/image/dither/dbs.cpp
+++ b/src/image/dither/dbs.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Direct Binary Search dithering
--- a/src/image/dither/ediff.cpp
+++ b/src/image/dither/ediff.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Generic error diffusion functions
--- a/src/image/dither/ordered.cpp
+++ b/src/image/dither/ordered.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Bayer ordered dithering functions
--- a/src/image/dither/ostromoukhov.cpp
+++ b/src/image/dither/ostromoukhov.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Ostromoukhov dithering functions
--- a/src/image/dither/random.cpp
+++ b/src/image/dither/random.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Random dithering
--- a/src/image/filter/color.cpp
+++ b/src/image/filter/color.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Colour manipulation functions
--- a/src/image/filter/convolution.cpp
+++ b/src/image/filter/convolution.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Generic convolution functions
--- a/src/image/filter/dilate.cpp
+++ b/src/image/filter/dilate.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Dilate and erode functions
--- a/src/image/filter/median.cpp
+++ b/src/image/filter/median.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Median filter functions
--- a/src/image/filter/yuv.cpp
+++ b/src/image/filter/yuv.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * YUV conversion functions
--- a/src/image/image.cpp
+++ b/src/image/image.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "image-private.h"

 #include <algorithm> /* for std::swap */
--- a/src/image/kernel.cpp
+++ b/src/image/kernel.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Stock kernels
--- a/src/image/noise.cpp
+++ b/src/image/noise.cpp
@@ -8,11 +8,7 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif

 #include <lol/main.h>
 #include <lol/engine-internal.h>

 /*
 * Noise rendering functions
--- a/src/image/pixel.cpp
+++ b/src/image/pixel.cpp
@@ -8,11 +8,8 @@
 //   http://www.wtfpl.net/ for more details.
 //

 #if defined HAVE_CONFIG_H
 #   include "config.h"
 #endif
 #include <lol/engine-internal.h>

 #include <lol/main.h>
 #include "image-private.h"

 namespace lol