diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-11-25 23:52:10 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-11-25 23:52:10 +0000 |
| commit | 6744952e310e828ea29adeabd58b281cf2172c2f (patch) | |
| tree | 650db366121e99d2f57ee8f7e093295b324b55a9 | |
| parent | Always build ilt library shared (diff) | |
| download | ilt-6744952e310e828ea29adeabd58b281cf2172c2f.tar.bz2 ilt-6744952e310e828ea29adeabd58b281cf2172c2f.tar.xz ilt-6744952e310e828ea29adeabd58b281cf2172c2f.zip | |
Include stb directly
| -rw-r--r-- | Jamroot.jam | 2 | ||||
| -rw-r--r-- | game/terrain.cpp | 2 | ||||
| -rw-r--r-- | gfx/image.cpp | 2 | ||||
| -rw-r--r-- | gfx/models/stb_image.cpp | 2 | ||||
| -rw-r--r-- | gfx/models/texture.cpp | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/Jamroot.jam b/Jamroot.jam index 433eeba..fdd08cd 100644 --- a/Jamroot.jam +++ b/Jamroot.jam @@ -10,7 +10,6 @@ import sequence ; pkg-config.import sdl2 ; pkg-config.import glew ; -lib stb : : : : <include>/usr/include/stb ; lib pthread ; variant coverage : debug ; @@ -78,7 +77,6 @@ lib ilt : <library>sdl2 <library>glew <library>pthread - <use>stb : : <include>. <include>lib diff --git a/game/terrain.cpp b/game/terrain.cpp index ed8bca5..a7dd334 100644 --- a/game/terrain.cpp +++ b/game/terrain.cpp @@ -9,7 +9,7 @@ #include <location.hpp> #include <maths.h> #include <random> -#include <stb_image.h> +#include <stb/stb_image.h> Terrain::Terrain() : grass {Texture::cachedTexture.get("grass.png")}, water {Texture::cachedTexture.get("water.png")} { diff --git a/gfx/image.cpp b/gfx/image.cpp index 1fe2d31..41c59a2 100644 --- a/gfx/image.cpp +++ b/gfx/image.cpp @@ -1,6 +1,6 @@ #include "image.h" #include <cstddef> -#include <stb_image.h> +#include <stb/stb_image.h> #include <stdexcept> Image::Image(const char * fileName, int flags) : width {}, height {}, numComponents {} diff --git a/gfx/models/stb_image.cpp b/gfx/models/stb_image.cpp index 1daf279..c6b605e 100644 --- a/gfx/models/stb_image.cpp +++ b/gfx/models/stb_image.cpp @@ -5,5 +5,5 @@ # ifndef __clang__ # pragma GCC diagnostic ignored "-Wunused-but-set-variable" # endif -# include "stb_image.h" +# include "stb/stb_image.h" #endif diff --git a/gfx/models/texture.cpp b/gfx/models/texture.cpp index 342f890..898f495 100644 --- a/gfx/models/texture.cpp +++ b/gfx/models/texture.cpp @@ -1,8 +1,8 @@ #include "texture.h"
-#include "stb_image.h"
#include <cache.h>
#include <gfx/image.h>
#include <resource.h>
+#include <stb/stb_image.h>
Cache<Texture> Texture::cachedTexture;
|