From e59db03d116a9c9ce0a781043a2636fcb1de0e5c Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Wed, 23 Sep 2020 17:29:33 +0700 Subject: [PATCH] Rename 'modules' directory to 'external' Former-commit-id: 8d3eec465faeb69ecb18fdf8f7b81b11bdd463b1 --- .gitmodules | 4 ++-- addons/godot_xterm/native/SConstruct | 6 +++--- addons/godot_xterm/native/build.sh | 8 ++++---- addons/godot_xterm/native/{modules => external}/.gdignore | 0 addons/godot_xterm/native/{modules => external}/godot-cpp | 0 addons/godot_xterm/native/{modules => external}/libtsm | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename addons/godot_xterm/native/{modules => external}/.gdignore (100%) rename addons/godot_xterm/native/{modules => external}/godot-cpp (100%) rename addons/godot_xterm/native/{modules => external}/libtsm (100%) diff --git a/.gitmodules b/.gitmodules index dce4514..9af9d15 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "addons/godot_xterm/godot-cpp"] - path = addons/godot_xterm/native/modules/godot-cpp + path = addons/godot_xterm/native/external/godot-cpp url = https://github.com/godotengine/godot-cpp [submodule "addons/godot_xterm/libtsm"] - path = addons/godot_xterm/native/modules/libtsm + path = addons/godot_xterm/native/external/libtsm url = https://github.com/Aetf/libtsm [submodule "godot-cpp/"] url = https://github.com/godotengine/godot-cpp diff --git a/addons/godot_xterm/native/SConstruct b/addons/godot_xterm/native/SConstruct index 49e8462..1338f0b 100644 --- a/addons/godot_xterm/native/SConstruct +++ b/addons/godot_xterm/native/SConstruct @@ -18,10 +18,10 @@ opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'bi opts.Add(PathVariable('target_name', 'The library name.', 'libgodotxtermnative', PathVariable.PathAccept)) # Local dependency paths, adapt them to your setup -godot_headers_path = "modules/godot-cpp/godot_headers/" -cpp_bindings_path = "modules/godot-cpp/" +godot_headers_path = "external/godot-cpp/godot_headers/" +cpp_bindings_path = "external/godot-cpp/" cpp_library = "libgodot-cpp" -libtsm_path = "modules/libtsm/" +libtsm_path = "external/libtsm/" # only support 64 at this time.. bits = 64 diff --git a/addons/godot_xterm/native/build.sh b/addons/godot_xterm/native/build.sh index 2a63e96..874527c 100755 --- a/addons/godot_xterm/native/build.sh +++ b/addons/godot_xterm/native/build.sh @@ -6,17 +6,17 @@ set -e cd ${BASH_SOURCE%/*} # Initialize godot-cpp -if [ ! -d "modules/godot-cpp/bin" ] +if [ ! -d "external/godot-cpp/bin" ] then - cd modules/godot-cpp + cd external/godot-cpp scons platform=linux generate_bindings=yes -j12 cd ../.. fi # Build libtsm -if [ ! -f "modules/libtsm/build/src/tsm/libtsm.a" ] +if [ ! -f "external/libtsm/build/src/tsm/libtsm.a" ] then - cd modules/libtsm + cd external/libtsm mkdir -p build cd build cmake -DBUILD_SHARED_LIBS=n .. diff --git a/addons/godot_xterm/native/modules/.gdignore b/addons/godot_xterm/native/external/.gdignore similarity index 100% rename from addons/godot_xterm/native/modules/.gdignore rename to addons/godot_xterm/native/external/.gdignore diff --git a/addons/godot_xterm/native/modules/godot-cpp b/addons/godot_xterm/native/external/godot-cpp similarity index 100% rename from addons/godot_xterm/native/modules/godot-cpp rename to addons/godot_xterm/native/external/godot-cpp diff --git a/addons/godot_xterm/native/modules/libtsm b/addons/godot_xterm/native/external/libtsm similarity index 100% rename from addons/godot_xterm/native/modules/libtsm rename to addons/godot_xterm/native/external/libtsm