Skip to content

Commit e310e84

Browse files
committed
Removed include for tinyobjloader, updated docs
1 parent 7743a36 commit e310e84

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,14 @@ You can see examples of this in any of the application targets under `examples`.
158158
├─[engine]
159159
│ ├─[core] <- the engine's core library
160160
│ ├─[render] <- the engine's renderer
161+
| ├─[resources] <- the engine's resource types and loading system
161162
│ ├─[window] <- the engine's windowing and input library
162163
│ ├─[utils] <- the engine's utils library
163164
164165
├─[examples]
165166
│ ├─[game] <- an example app utilising all of the engine's libraries
166-
│ ├─[render] <- an example app demonstrating the renderer
167+
│ ├─[render] <- an example app demonstrating the renderer for 3D
168+
| ├─[tilemap] <- an example app demonstrating the renderer for a tilemap
167169
168170
├─[make] <- additional Make file utilities for the build system
169171
├─[packer] <- an asset packing app for bundling game assets in a pack file on build

engine/utils/FileSystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#include "FileSystem.h"
1111

12+
#include <algorithm>
1213
#include <cstdio>
1314
#include <fstream>
14-
#include <algorithm>
1515

1616
#include "Logging.h"
1717

engine/utils/String.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
#include "String.h"
1111

12+
#include <algorithm>
1213
#include <cstdlib>
1314
#include <cstring>
1415
#include <ostream>
1516
#include <stdexcept>
16-
#include <algorithm>
1717

1818
namespace Siege
1919
{

packer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ packerBuildDir := $(packerBinDir)/build
1818

1919
# Set build vars
2020
linkFlags += -l resources -l utils -L $(vendorDir)/zlib/build/lib -L $(vendorDir)/assimp/build/lib -l assimp -l z -l stdc++
21-
compileFlags += -I $(vendorDir)/tinyobjloader -I $(vendorDir)/stb_image -I $(vendorDir)/assimp/include -I $(vendorDir)/assimp/build/include
21+
compileFlags += -I $(vendorDir)/stb_image -I $(vendorDir)/assimp/include -I $(vendorDir)/assimp/build/include
2222

2323
.PHONY: all
2424

0 commit comments

Comments
 (0)