diff --git a/.gitmodules b/.gitmodules index 1d648bb..62fc617 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,9 +5,9 @@ [submodule "subprojects/rapidjson"] path = subprojects/rapidjson url = https://github.com/Tencent/rapidjson/ -[submodule "subprojects/zlib"] - path = subprojects/zlib - url = https://github.com/madler/zlib.git [submodule "subprojects/cNBT"] path = subprojects/cNBT - url = https://github.com/nickelpro/cNBT.git + url = https://github.com/Joshua-Ashton/cNBT +[submodule "subprojects/zlib"] + path = subprojects/zlib + url = https://github.com/madler/zlib diff --git a/meson.build b/meson.build index caa9311..c4aed9b 100644 --- a/meson.build +++ b/meson.build @@ -16,20 +16,6 @@ threads_dep = dependency('threads') cmake = import('cmake') -######################################## -# zlib -######################################## - -zlib_vars = cmake.subproject_options() -zlib_vars.add_cmake_defines({ - 'BUILD_SHARED_LIBS' : false -}) -zlib_vars.set_install(false) - -zlib_proj = cmake.subproject('zlib', options : zlib_vars) -zlib_dep = zlib_proj.dependency('zlibstatic') - - ######################################## # libevent ######################################## @@ -55,24 +41,13 @@ libevent_extra_dep = libevent_proj.dependency('event_extra_static') # cNBT ######################################## -# TODO: cNBT - -cnbt_vars = cmake.subproject_options() -cnbt_vars.add_cmake_defines({ - 'CNBT_BUILD_EXAMPLES' : false, - 'BUILD_SHARED_LIBS' : false, -}) - -cnbt_vars.set_install(false) - -cnbt_proj = cmake.subproject('cNBT', options : cnbt_vars) -cnbt_dep = cnbt_proj.dependency('nbt') +cnbt_proj = subproject('cNBT') +cnbt_dep = cnbt_proj.get_variable('cnbt_dep') ######################################## feather_deps = [ threads_dep, - zlib_dep, libevent_core_dep, libevent_extra_dep, cnbt_dep diff --git a/subprojects/cNBT b/subprojects/cNBT index e385f35..47b0c4b 160000 --- a/subprojects/cNBT +++ b/subprojects/cNBT @@ -1 +1 @@ -Subproject commit e385f356c08a8d86be6ee4adbef0b9a0c3675152 +Subproject commit 47b0c4be1f19912919976124fe07b70410353c02 diff --git a/subprojects/libevent b/subprojects/libevent index 62c152d..7e6c5fb 160000 --- a/subprojects/libevent +++ b/subprojects/libevent @@ -1 +1 @@ -Subproject commit 62c152d9a7cd264b993dad730c4163c6ede2e0a3 +Subproject commit 7e6c5fb46ae9d0f135cdcdb4f8d0376cf25320fd