TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Fix missing OpenSLES link on Android

Browse Source
This commit is contained in:
rdb 2021-12-06 22:27:32 +01:00
parent c594ab38ef
commit 798fa90513
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makepanda/makepanda.py
View File

@ -1014,6 +1014,7 @@ if (COMPILER=="GCC"):
LibName("ALWAYS", '-llog') LibName("ALWAYS", '-llog')
LibName("ANDROID", '-landroid') LibName("ANDROID", '-landroid')
LibName("JNIGRAPHICS", '-ljnigraphics') LibName("JNIGRAPHICS", '-ljnigraphics')
LibName("OPENSLES", '-lOpenSLES')
for pkg in MAYAVERSIONS: for pkg in MAYAVERSIONS:
if (PkgSkip(pkg)==0 and (pkg in SDK)): if (PkgSkip(pkg)==0 and (pkg in SDK)):
@ -4327,7 +4328,7 @@ if PkgSkip("OPENAL") == 0:
TargetAdd('openal_audio_openal_audio_composite1.obj', opts=OPTS, input='openal_audio_composite1.cxx') TargetAdd('openal_audio_openal_audio_composite1.obj', opts=OPTS, input='openal_audio_composite1.cxx')
TargetAdd('libp3openal_audio.dll', input='openal_audio_openal_audio_composite1.obj') TargetAdd('libp3openal_audio.dll', input='openal_audio_openal_audio_composite1.obj')
TargetAdd('libp3openal_audio.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3openal_audio.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libp3openal_audio.dll', opts=['MODULE', 'ADVAPI', 'WINUSER', 'WINMM', 'WINSHELL', 'WINOLE', 'OPENAL']) TargetAdd('libp3openal_audio.dll', opts=['MODULE', 'ADVAPI', 'WINUSER', 'WINMM', 'WINSHELL', 'WINOLE', 'OPENAL', 'OPENSLES'])
# #
# DIRECTORY: panda/src/downloadertools/ # DIRECTORY: panda/src/downloadertools/