Move gltfpack sources to gltf/

This adds a folder that we can put all gltfpack-related sources to. The name was chosen over gltfpack to avoid conflicts with gltfpack executable name since this doesn't change the build structure for now.
zeux · Feb 8, 2020 · 5729ed6 · 5729ed6
1 parent 92ba049
commit 5729ed6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,11 @@ set(SOURCES
     src/vfetchoptimizer.cpp
 )
 
+set(GLTF_SOURCES
+    gltf/basistoktx.cpp
+    gltf/gltfpack.cpp
+)
+
 if(MSVC)
     add_compile_options(/W4 /WX)
 else()
@@ -59,7 +64,7 @@ if(MESHOPT_BUILD_DEMO)
 endif()
 
 if(MESHOPT_BUILD_TOOLS)
-    add_executable(gltfpack tools/gltfpack.cpp tools/meshloader.cpp tools/basistoktx.cpp)
+    add_executable(gltfpack ${GLTF_SOURCES} tools/meshloader.cpp)
     target_link_libraries(gltfpack meshoptimizer)
     list(APPEND TARGETS gltfpack)
 

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ LIBRARY_OBJECTS=$(LIBRARY_SOURCES:%=$(BUILD)/%.o)
 DEMO_SOURCES=$(wildcard demo/*.c demo/*.cpp) tools/meshloader.cpp
 DEMO_OBJECTS=$(DEMO_SOURCES:%=$(BUILD)/%.o)
 
-GLTFPACK_SOURCES=tools/gltfpack.cpp tools/meshloader.cpp tools/basistoktx.cpp
+GLTFPACK_SOURCES=$(wildcard gltf/*.cpp) tools/meshloader.cpp
 GLTFPACK_OBJECTS=$(GLTFPACK_SOURCES:%=$(BUILD)/%.o)
 
 OBJECTS=$(LIBRARY_OBJECTS) $(DEMO_OBJECTS) $(GLTFPACK_OBJECTS)

diff --git a/tools/basistoktx.cpp → gltf/basistoktx.cpp b/tools/basistoktx.cpp → gltf/basistoktx.cpp
diff --git a/tools/basisu_format.h → gltf/basisu_format.h b/tools/basisu_format.h → gltf/basisu_format.h
diff --git a/tools/gltfpack.cpp → gltf/gltfpack.cpp b/tools/gltfpack.cpp → gltf/gltfpack.cpp
@@ -42,8 +42,8 @@
 #include <unistd.h>
 #endif
 
-#include "cgltf.h"
-#include "fast_obj.h"
+#include "../tools/cgltf.h"
+#include "../tools/fast_obj.h"
 
 struct Attr
 {

diff --git a/tools/khr_df.h → gltf/khr_df.h b/tools/khr_df.h → gltf/khr_df.h