Skip to content

Commit a534a6e

Browse files
devlogloganstechyo
authored andcommitted
Build system tweaks
1 parent 29d75a0 commit a534a6e

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ project/addons/godot-steam-audio/bin/*.ilk
99
project/addons/godot-steam-audio/bin/*.exp
1010
project/addons/godot-steam-audio/bin/*.lib
1111
project/addons/godot-steam-audio/bin/*.dylib
12+
project/addons/godot-steam-audio/bin/android/arm64/libphonon.so
13+
project/addons/godot-steam-audio/bin/android/x86_64/libphonon.so
1214
src/gen/*

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ install-steam-audio:
44
| cut -d : -f 2,3 | tr -d \" | wget -O src/lib/steamaudio.zip -i -
55
unzip src/lib/steamaudio.zip -d src/lib/
66
rm src/lib/steamaudio.zip
7-
cp src/lib/steamaudio/lib/linux-x64/libphonon.so project/addons/godot-steam-audio/bin
7+
cp src/lib/steamaudio/lib/linux-x64/* project/addons/godot-steam-audio/bin/
8+
cp src/lib/steamaudio/lib/windows-x64/* project/addons/godot-steam-audio/bin/
9+
cp src/lib/steamaudio/lib/android-armv8/* project/addons/godot-steam-audio/bin/android/arm64
10+
cp src/lib/steamaudio/lib/android-x64/* project/addons/godot-steam-audio/bin/android/x86_64
811

912
release:
1013
scons platform=android arch=arm64 target=template_release && scons platform=android arch=x86_64 target=template_release && \

SConstruct

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
#!/usr/bin/env python
2+
import os
3+
4+
godot_cpp_path = "src/lib/godot-cpp"
5+
steam_audio_path = "src/lib/steamaudio"
6+
if (not (os.path.isdir(godot_cpp_path) and os.listdir(godot_cpp_path))) or (not (os.path.isdir(steam_audio_path) and os.listdir(steam_audio_path))):
7+
print("""Git submodule dependencies are missing.
8+
Run the following command to install them:
9+
git submodule update --init --recursive""")
10+
Exit(1)
211

312
env = SConscript("src/lib/godot-cpp/SConstruct")
413

14+
steam_audio_lib_path = env.get("STEAM_AUDIO_LIB_PATH", "src/lib/steamaudio/lib")
15+
if not (os.path.isdir(steam_audio_lib_path) and os.listdir(steam_audio_lib_path)):
16+
print("""No valid Steam Audio library path was found.
17+
Run the following command to install the latest release:
18+
make install-steam-audio""")
19+
Exit(1)
20+
521
env.Append(CPPPATH=["src/"])
622

723
if env.get("CC", "").lower() == "cl":
@@ -12,38 +28,31 @@ else:
1228

1329
sources = Glob("src/*.cpp")
1430

15-
steam_audio_lib_path = env.get("STEAM_AUDIO_LIB_PATH", "src/lib/steamaudio/lib")
31+
env.Append(LIBS=["phonon"])
1632

1733
if env["platform"] == "linux":
1834
env.Append(LIBPATH=[f'{steam_audio_lib_path}/linux-x64'])
19-
env.Append(LIBS=["libphonon.so"])
2035
env.Append(LINKFLAGS=["-Wl,--version-script={}".format(env.File("linux_symbols.map").abspath)])
2136
elif env["platform"] == "windows":
2237
env.Append(LIBPATH=[f'{steam_audio_lib_path}/windows-x64'])
23-
env.Append(LIBS=["phonon"])
2438
elif env["platform"] == "macos":
2539
env.Append(LIBPATH=[f'{steam_audio_lib_path}/osx'])
26-
env.Append(LIBS=["libphonon.dylib"])
2740
elif env["platform"] == "android":
2841
if env["arch"] == "arm64":
2942
env.Append(LIBPATH=[f'{steam_audio_lib_path}/android-armv8'])
30-
env.Append(LIBS=["libphonon.so"])
3143
if env["arch"] == "arm32":
3244
env.Append(LIBPATH=[f'{steam_audio_lib_path}/android-armv7'])
33-
env.Append(LIBS=["libphonon.so"])
3445
if env["arch"] == "x86_64":
3546
env.Append(LIBPATH=[f'{steam_audio_lib_path}/android-x64'])
36-
env.Append(LIBS=["libphonon.so"])
3747
if env["arch"] == "x86_32":
3848
env.Append(LIBPATH=[f'{steam_audio_lib_path}/android-x32'])
39-
env.Append(LIBS=["libphonon.so"])
4049

4150
if env["target"] in ["editor", "template_debug"]:
4251
doc_data = env.GodotCPPDocData("src/gen/doc_data.gen.cpp", source=Glob("doc_classes/*.xml"))
4352
sources.append(doc_data)
4453

4554
library = env.SharedLibrary(
46-
"project/addons/godot-steam-audio/bin/godot-steam-audio{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
55+
"project/addons/godot-steam-audio/bin/libgodot-steam-audio{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
4756
source=sources,
4857
)
4958

0 commit comments

Comments
 (0)