This commit is contained in:
2023-02-25 16:06:29 -05:00
15 changed files with 200 additions and 38 deletions

View File

@@ -1,5 +1,9 @@
# depslib dependency file v1.0
<<<<<<< HEAD
1672107417 source:c:\development\xtreemminer\main.cpp
=======
1672097148 source:c:\development\xtreemminer\main.cpp
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
<stdlib.h>
<GL/glut.h>
"Utilities.h"
@@ -9,11 +13,14 @@
"TextureHandler.h"
<math.h>
<cstdio>
"FastNoiseLite.h"
<random>
<SFML/Window.hpp>
<<<<<<< HEAD
1672201712 c:\development\xtreemminer\include\noderenderer.h
=======
1667160597 c:\development\xtreemminer\include\noderenderer.h
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
"Base.h"
"MapBlock.h"
<GL/glut.h>
@@ -29,7 +36,11 @@
"MapBlock.h"
"Base.h"
<<<<<<< HEAD
1672341127 c:\development\xtreemminer\include\texturehandler.h
=======
1672105046 c:\development\xtreemminer\include\texturehandler.h
>>>>>>> dcac2713f6b72f4d2252632a179b30a33fd827a8
"stb_image.h"
"Base.h"