extern: Move most third-party dependencies to extern

With the exception of miniz, third-party source is now in extern/ folder.
y-71 · Feb 8, 2020 · eb9ec11 · eb9ec11
1 parent dd86053
commit eb9ec11
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 11 deletions.
diff --git a/demo/main.cpp b/demo/main.cpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "../tools/fast_obj.h"
+#include "../extern/fast_obj.h"
 #include "miniz.h"
 
 // This file uses assert() to verify algorithm correctness

diff --git a/gltf/basisu_format.h → extern/basisu_format.h b/gltf/basisu_format.h → extern/basisu_format.h
diff --git a/tools/cgltf.h → extern/cgltf.h b/tools/cgltf.h → extern/cgltf.h
diff --git a/tools/fast_obj.h → extern/fast_obj.h b/tools/fast_obj.h → extern/fast_obj.h
diff --git a/gltf/khr_df.h → extern/khr_df.h b/gltf/khr_df.h → extern/khr_df.h
diff --git a/gltf/basistoktx.cpp b/gltf/basistoktx.cpp
@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "basisu_format.h"
-#include "khr_df.h"
+#include "../extern/basisu_format.h"
+#include "../extern/khr_df.h"
 
 // KTX Specification: 2. File Structure
 struct Ktx2Header

diff --git a/gltf/gltfpack.h b/gltf/gltfpack.h
@@ -15,7 +15,7 @@
 #define _CRT_NONSTDC_NO_WARNINGS
 #endif
 
-#include "../tools/cgltf.h"
+#include "../extern/cgltf.h"
 
 #include <assert.h>
 

diff --git a/gltf/parseobj.cpp b/gltf/parseobj.cpp
@@ -1,7 +1,7 @@
 // This file is part of gltfpack; see gltfpack.h for version/license details
 #include "gltfpack.h"
 
-#include "../tools/fast_obj.h"
+#include "../extern/fast_obj.h"
 
 #include <algorithm>
 

diff --git a/tools/lodviewer.cpp b/tools/lodviewer.cpp
@@ -1,8 +1,8 @@
 #define _CRT_SECURE_NO_WARNINGS
 
 #include "../src/meshoptimizer.h"
-#include "fast_obj.h"
-#include "cgltf.h"
+#include "../extern/fast_obj.h"
+#include "../extern/cgltf.h"
 
 #include <algorithm>
 #include <cmath>

diff --git a/tools/meshloader.cpp b/tools/meshloader.cpp
@@ -3,7 +3,7 @@
 #endif
 
 #define CGLTF_IMPLEMENTATION
-#include "cgltf.h"
+#include "../extern/cgltf.h"
 
 #define FAST_OBJ_IMPLEMENTATION
-#include "fast_obj.h"
+#include "../extern/fast_obj.h"
diff --git a/tools/vcachetester.cpp b/tools/vcachetester.cpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "../src/meshoptimizer.h"
-#include "fast_obj.h"
+#include "../extern/fast_obj.h"
 
 #pragma comment(lib, "d3d11.lib")
 #pragma comment(lib, "d3dcompiler.lib")

diff --git a/tools/vcachetuner.cpp b/tools/vcachetuner.cpp
@@ -1,5 +1,5 @@
 #include "../src/meshoptimizer.h"
-#include "fast_obj.h"
+#include "../extern/fast_obj.h"
 #include "../demo/miniz.h"
 
 #include <algorithm>