From 54cbe83c56f13783c59abee302d4f0bbe005cbd7 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Thu, 13 Jun 2019 16:54:12 +0200 Subject: Simplify webrtc lib folder structure --- SConstruct | 4 ++-- lib/webrtc/.gitignore | 1 - lib/webrtc/lib/linux/.gitignore | 2 -- lib/webrtc/lib/windows/.gitignore | 2 -- webrtc/.gitignore | 1 + webrtc/linux/.gitignore | 2 ++ webrtc/windows/.gitignore | 2 ++ 7 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 lib/webrtc/.gitignore delete mode 100644 lib/webrtc/lib/linux/.gitignore delete mode 100644 lib/webrtc/lib/windows/.gitignore create mode 100644 webrtc/.gitignore create mode 100644 webrtc/linux/.gitignore create mode 100644 webrtc/windows/.gitignore diff --git a/SConstruct b/SConstruct index 0fff964..6819640 100644 --- a/SConstruct +++ b/SConstruct @@ -116,9 +116,9 @@ env.Append(LIBPATH=[godot_cpp_lib_dir]) env.Append(LIBS=['%sgodot-cpp.%s.%s.%s' % (lib_prefix, target_platform, target, target_arch)]) # WebRTC stuff -webrtc_dir = "lib/webrtc" +webrtc_dir = "webrtc" lib_name = 'libwebrtc_full' -lib_path = webrtc_dir + '/lib/' + target_platform +lib_path = os.path.join(webrtc_dir, target_platform) if target_arch == '64': lib_path += '/x64' diff --git a/lib/webrtc/.gitignore b/lib/webrtc/.gitignore deleted file mode 100644 index 08f514e..0000000 --- a/lib/webrtc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -include/ diff --git a/lib/webrtc/lib/linux/.gitignore b/lib/webrtc/lib/linux/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/lib/webrtc/lib/linux/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/lib/webrtc/lib/windows/.gitignore b/lib/webrtc/lib/windows/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/lib/webrtc/lib/windows/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/webrtc/.gitignore b/webrtc/.gitignore new file mode 100644 index 0000000..08f514e --- /dev/null +++ b/webrtc/.gitignore @@ -0,0 +1 @@ +include/ diff --git a/webrtc/linux/.gitignore b/webrtc/linux/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/webrtc/linux/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/webrtc/windows/.gitignore b/webrtc/windows/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/webrtc/windows/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore -- cgit v1.2.3