Skip to content

Commit 2ca6110

Browse files
committed
Add stb as submodule
1 parent 3299313 commit 2ca6110

File tree

11 files changed

+28
-22
lines changed

11 files changed

+28
-22
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "subprojects/sqlitecpp"]
55
path = subprojects/sqlitecpp
66
url = https://github.com/SRombauts/SQLiteCpp.git
7+
[submodule "stb"]
8+
path = stb
9+
url = https://github.com/nothings/stb.git

include/graphics/GL.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#endif
2121
#include <GLFW/glfw3.h>
2222

23-
#include <stb/stb_image.h>
24-
#include <stb/stb_image_write.h>
23+
#include "lib/stb/stb_image.h"
24+
#include "lib/stb/stb_image_write.h"
2525

2626
// #define HIDE_CHECKGL
2727

include/lib/stb/stb_image.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../stb/stb_image.h

include/lib/stb/stb_image_write.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../stb/stb_image_write.h

src/Texture.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#define STB_IMAGE_IMPLEMENTATION
1212
#ifdef USING_VCPKG
13-
#include <stb_image.h>
13+
#include "lib/stb/stb_image.h"
1414
#else
15-
#include <stb/stb_image.h>
15+
#include "lib/stb/stb_image.h"
1616
#endif
1717

1818
#include <nlohmann/json.hpp>

src/tools/Flasker.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <sstream>
66

77
#ifdef USING_VCPKG
8-
#include <stb_image.h>
8+
#include "lib/stb/stb_image.h"
99
#else
10-
#include <stb/stb_image.h>
10+
#include "lib/stb/stb_image.h"
1111
#endif
1212

1313
#ifdef __clang__
@@ -22,9 +22,9 @@
2222

2323
#define STB_IMAGE_WRITE_IMPLEMENTATION
2424
#ifdef USING_VCPKG
25-
#include <stb_image_write.h>
25+
#include "lib/stb/stb_image_write.h"
2626
#else
27-
#include <stb/stb_image_write.h>
27+
#include "lib/stb/stb_image_write.h"
2828
#endif
2929

3030
#ifdef __clang__

src/tools/ItemStitcher.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#include <nlohmann/json.hpp>
1515

1616
#ifdef USING_VCPKG
17-
#include <stb_image.h>
18-
#include <stb_image_write.h>
17+
#include "lib/stb/stb_image.h"
18+
#include "lib/stb/stb_image_write.h"
1919
#else
20-
#include <stb/stb_image.h>
21-
#include <stb/stb_image_write.h>
20+
#include "lib/stb/stb_image.h"
21+
#include "lib/stb/stb_image_write.h"
2222
#endif
2323

2424
namespace Game3 {

src/tools/Splitter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include <nlohmann/json.hpp>
1313

1414
#ifdef USING_VCPKG
15-
#include <stb_image.h>
16-
#include <stb_image_write.h>
15+
#include "lib/stb/stb_image.h"
16+
#include "lib/stb/stb_image_write.h"
1717
#else
18-
#include <stb/stb_image.h>
19-
#include <stb/stb_image_write.h>
18+
#include "lib/stb/stb_image.h"
19+
#include "lib/stb/stb_image_write.h"
2020
#endif
2121

2222
namespace Game3 {

src/tools/TileStitcher.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include <nlohmann/json.hpp>
1313

1414
#ifdef USING_VCPKG
15-
#include <stb_image.h>
16-
#include <stb_image_write.h>
15+
#include "lib/stb/stb_image.h"
16+
#include "lib/stb/stb_image_write.h"
1717
#else
18-
#include <stb/stb_image.h>
19-
#include <stb/stb_image_write.h>
18+
#include "lib/stb/stb_image.h"
19+
#include "lib/stb/stb_image_write.h"
2020
#endif
2121

2222
namespace Game3 {

src/ui/Canvas.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717

1818

19-
#include <stb/stb_image.h>
20-
#include <stb/stb_image_write.h>
19+
#include "lib/stb/stb_image.h"
20+
#include "lib/stb/stb_image_write.h"
2121

2222

2323

0 commit comments

Comments
 (0)