TOOLS: moved glslang into tools
parent
78c39f4388
commit
0dcfe29fe9
|
@ -172,6 +172,7 @@ include_directories(src/modules/compute/shaders)
|
||||||
include_directories(src/modules)
|
include_directories(src/modules)
|
||||||
|
|
||||||
add_subdirectory(contrib/libs)
|
add_subdirectory(contrib/libs)
|
||||||
|
add_subdirectory(tools)
|
||||||
|
|
||||||
if (UNITTESTS)
|
if (UNITTESTS)
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
20
Makefile
20
Makefile
|
@ -154,16 +154,16 @@ update-sdl2mixer:
|
||||||
|
|
||||||
update-glslang:
|
update-glslang:
|
||||||
$(call UPDATE_GIT,glslang,https://github.com/KhronosGroup/glslang.git)
|
$(call UPDATE_GIT,glslang,https://github.com/KhronosGroup/glslang.git)
|
||||||
rm -rf src/tools/glslang/External
|
rm -rf tools/glslang/External
|
||||||
cp -r $(UPDATEDIR)/glslang.sync/External src/tools/glslang/
|
cp -r $(UPDATEDIR)/glslang.sync/External tools/glslang/
|
||||||
rm -rf src/tools/glslang/glslang
|
rm -rf tools/glslang/glslang
|
||||||
cp -r $(UPDATEDIR)/glslang.sync/glslang src/tools/glslang/
|
cp -r $(UPDATEDIR)/glslang.sync/glslang tools/glslang/
|
||||||
rm -rf src/tools/glslang/OGLCompilersDLL
|
rm -rf tools/glslang/OGLCompilersDLL
|
||||||
cp -r $(UPDATEDIR)/glslang.sync/OGLCompilersDLL src/tools/glslang/
|
cp -r $(UPDATEDIR)/glslang.sync/OGLCompilersDLL tools/glslang/
|
||||||
rm -rf src/tools/glslang/SPIRV
|
rm -rf tools/glslang/SPIRV
|
||||||
cp -r $(UPDATEDIR)/glslang.sync/SPIRV src/tools/glslang/
|
cp -r $(UPDATEDIR)/glslang.sync/SPIRV tools/glslang/
|
||||||
rm -rf src/tools/glslang/StandAlone
|
rm -rf tools/glslang/StandAlone
|
||||||
cp -r $(UPDATEDIR)/glslang.sync/StandAlone src/tools/glslang/
|
cp -r $(UPDATEDIR)/glslang.sync/StandAlone tools/glslang/
|
||||||
|
|
||||||
update-simplecpp:
|
update-simplecpp:
|
||||||
$(call UPDATE_GIT,simplecpp,https://github.com/danmar/simplecpp.git)
|
$(call UPDATE_GIT,simplecpp,https://github.com/danmar/simplecpp.git)
|
||||||
|
|
|
@ -2,7 +2,6 @@ add_subdirectory(shadertool)
|
||||||
add_subdirectory(computeshadertool)
|
add_subdirectory(computeshadertool)
|
||||||
add_subdirectory(databasetool)
|
add_subdirectory(databasetool)
|
||||||
add_subdirectory(uitool)
|
add_subdirectory(uitool)
|
||||||
add_subdirectory(glslang)
|
|
||||||
|
|
||||||
if (TOOLS)
|
if (TOOLS)
|
||||||
if (VOXEDIT)
|
if (VOXEDIT)
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
add_subdirectory(glslang)
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue