diff --git a/.gitmodules b/.gitmodules index fa6d2c3..ed8a7cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -131,3 +131,12 @@ [submodule "Minecraft/Mods/BetterEnd"] path = Minecraft/Mods/BetterEnd url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/BetterEnd +[submodule "SecondLife/Sim-Status-Notifier"] + path = SecondLife/Sim-Status-Notifier + url = ssh://git@git.zontreck.com:1212/AriasCreations/Sim-Status-Notifier +[submodule "SecondLife/GameTables"] + path = SecondLife/GameTables + url = ssh://git@git.zontreck.com:1212/ariascreations/game-tables +[submodule "bashtop"] + path = bashtop + url = git@github.com:aristocratos/bashtop.git diff --git a/Aseprite/aseprite b/Aseprite/aseprite index e129fef..f64e806 160000 --- a/Aseprite/aseprite +++ b/Aseprite/aseprite @@ -1 +1 @@ -Subproject commit e129fefb2e50e3abe8b9f4b0be177476966ce2be +Subproject commit f64e8065e7a24ff4172544f937f37fa5e3846e63 diff --git a/Aseprite/depot_tools b/Aseprite/depot_tools index 5658134..b7ed76a 160000 --- a/Aseprite/depot_tools +++ b/Aseprite/depot_tools @@ -1 +1 @@ -Subproject commit 56581348a2c54ed71b96d96681a4c17d491a38c3 +Subproject commit b7ed76a09d1953d75968cbc14a53f724c11fb5f9 diff --git a/Aseprite/setup_aseprite_env.sh b/Aseprite/setup_aseprite_env.sh index b8783b4..ea4e67f 100755 --- a/Aseprite/setup_aseprite_env.sh +++ b/Aseprite/setup_aseprite_env.sh @@ -1,10 +1,19 @@ #!/bin/bash +function ban2() +{ + echo "===========================================" + echo "${1}" + echo "===========================================" +} + export PATH="$PATH:$(pwd)/depot_tools" pushd skia +ban2 "Building Skia" git clean -xfd git reset --hard +git pull python tools/git-sync-deps gn gen out/Release-x64 --args="is_debug=false is_official_build=true skia_use_system_expat=false skia_use_system_icu=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false skia_use_sfntly=false skia_use_freetype=true skia_use_harfbuzz=true skia_pdf_subset_harfbuzz=true skia_use_system_freetype2=false skia_use_system_harfbuzz=false" @@ -17,13 +26,14 @@ pushd aseprite git clean -xfd git reset --hard +git pull rm -rf build mkdir build pushd build +ban2 "Building Aseprite" cmake -G Ninja -DLAF_BACKEND=skia -DSKIA_DIR=../../skia -DSKIA_LIBRARY_DIR=../../skia/out/Release-x64 -DSKIA_LIBRARY=../../skia/out/Release-x64/libskia.a .. - ninja aseprite popd diff --git a/SecondLife/GameTables b/SecondLife/GameTables new file mode 160000 index 0000000..e421184 --- /dev/null +++ b/SecondLife/GameTables @@ -0,0 +1 @@ +Subproject commit e4211846df55ca7136760edc90c1e6787baee3b6 diff --git a/SecondLife/Sim-Status-Notifier b/SecondLife/Sim-Status-Notifier new file mode 160000 index 0000000..0c06df5 --- /dev/null +++ b/SecondLife/Sim-Status-Notifier @@ -0,0 +1 @@ +Subproject commit 0c06df5f9cf0b33100a4bbdb22df8f2070d52227 diff --git a/bashtop b/bashtop new file mode 160000 index 0000000..60f95a1 --- /dev/null +++ b/bashtop @@ -0,0 +1 @@ +Subproject commit 60f95a1a74c8e7e589c02aa03d60141152df8337