From 92f8669d5a0efc7a295b2c82202052420bcfcdf1 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Fri, 12 Aug 2022 12:04:10 +0000 Subject: [PATCH] Move stuff to subprojects instead --- .gitmodules | 4 ++-- meson.build | 3 +-- {thirdparty => subprojects}/miniz | 0 {thirdparty => subprojects}/stb | 0 thirdparty/meson.build | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) rename {thirdparty => subprojects}/miniz (100%) rename {thirdparty => subprojects}/stb (100%) delete mode 100644 thirdparty/meson.build diff --git a/.gitmodules b/.gitmodules index 00a4f51..74c0b8f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "ThirdParty/stb"] - path = thirdparty/stb + path = subprojects/stb url = https://github.com/nothings/stb [submodule "thirdparty/miniz"] - path = thirdparty/miniz + path = subprojects/miniz url = https://github.com/richgel999/miniz diff --git a/meson.build b/meson.build index fefeca0..86e7f3b 100644 --- a/meson.build +++ b/meson.build @@ -17,9 +17,8 @@ glsl_generator = generator(glsl_compiler, arguments : glsl_args, ) -orange_include = include_directories(['include', 'thirdparty']) +orange_include = include_directories(['include', 'subprojects']) sdl2_dep = dependency('SDL2') vulkan_dep = dependency('vulkan') # get rid of me! -subdir('thirdparty') subdir('src') diff --git a/thirdparty/miniz b/subprojects/miniz similarity index 100% rename from thirdparty/miniz rename to subprojects/miniz diff --git a/thirdparty/stb b/subprojects/stb similarity index 100% rename from thirdparty/stb rename to subprojects/stb diff --git a/thirdparty/meson.build b/thirdparty/meson.build deleted file mode 100644 index 0bf07c7..0000000 --- a/thirdparty/meson.build +++ /dev/null @@ -1 +0,0 @@ -subdir('miniz')