summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2019-06-13 16:54:12 +0200
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2020-01-03 19:41:21 +0100
commit54cbe83c56f13783c59abee302d4f0bbe005cbd7 (patch)
tree855d0587ec2f2d6d086594ffb8ba59b36b2e7c97
parent20f8f89c2cbe1e95a93fc89894324ccbbbf54c4b (diff)
downloadfork-godot-webrtc-native-54cbe83c56f13783c59abee302d4f0bbe005cbd7.tar.gz
fork-godot-webrtc-native-54cbe83c56f13783c59abee302d4f0bbe005cbd7.tar.bz2
fork-godot-webrtc-native-54cbe83c56f13783c59abee302d4f0bbe005cbd7.zip
Simplify webrtc lib folder structure
-rw-r--r--SConstruct4
-rw-r--r--webrtc/.gitignore (renamed from lib/webrtc/.gitignore)0
-rw-r--r--webrtc/linux/.gitignore (renamed from lib/webrtc/lib/linux/.gitignore)0
-rw-r--r--webrtc/windows/.gitignore (renamed from lib/webrtc/lib/windows/.gitignore)0
4 files changed, 2 insertions, 2 deletions
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/webrtc/.gitignore
index 08f514e..08f514e 100644
--- a/lib/webrtc/.gitignore
+++ b/webrtc/.gitignore
diff --git a/lib/webrtc/lib/linux/.gitignore b/webrtc/linux/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/lib/webrtc/lib/linux/.gitignore
+++ b/webrtc/linux/.gitignore
diff --git a/lib/webrtc/lib/windows/.gitignore b/webrtc/windows/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/lib/webrtc/lib/windows/.gitignore
+++ b/webrtc/windows/.gitignore