TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Audio and display libraries should not be versioned

Browse Source
This commit is contained in:
rdb 2009-11-25 07:51:41 +00:00
parent eb295d96fa
commit 4bb50f3b0e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
makepanda/makepanda.py
View File

@ -1089,7 +1089,7 @@ def CompileAnything(target, inputs, opts, progress = None):
ProgressOutput(progress, "Linking dynamic library", target)
# Add version number to the dynamic library, on unix
if (origsuffix==".dll" and not sys.platform.startswith("win") and not RTDIST):
if (origsuffix==".dll" and "NOVERSION" not in OPTS and not sys.platform.startswith("win") and not RTDIST):
if (sys.platform == "darwin"):
if (target.lower().endswith(".dylib")):
target = target[:-5] + VERSION + ".dylib"
@ -2743,14 +2743,14 @@ if PkgSkip("FMODEX") == 0 and not RUNTIME:
TargetAdd('fmod_audio_fmod_audio_composite.obj', opts=OPTS, input='fmod_audio_composite.cxx')
TargetAdd('libp3fmod_audio.dll', input='fmod_audio_fmod_audio_composite.obj')
TargetAdd('libp3fmod_audio.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libp3fmod_audio.dll', opts=['ADVAPI', 'WINUSER', 'WINMM', 'FMODEX'])
TargetAdd('libp3fmod_audio.dll', opts=['NOVERSION', 'ADVAPI', 'WINUSER', 'WINMM', 'FMODEX'])
if PkgSkip("OPENAL") == 0 and not RUNTIME:
OPTS=['DIR:panda/src/audiotraits', 'BUILDING:OPENAL_AUDIO', 'OPENAL']
TargetAdd('openal_audio_openal_audio_composite.obj', opts=OPTS, input='openal_audio_composite.cxx')
TargetAdd('libp3openal_audio.dll', input='openal_audio_openal_audio_composite.obj')
TargetAdd('libp3openal_audio.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libp3openal_audio.dll', opts=['ADVAPI', 'WINUSER', 'WINMM', 'OPENAL'])
TargetAdd('libp3openal_audio.dll', opts=['NOVERSION', 'ADVAPI', 'WINUSER', 'WINMM', 'OPENAL'])
#
# DIRECTORY: panda/src/downloadertools/
@ -2850,7 +2850,7 @@ if PkgSkip("DX8")==0 and not RUNTIME:
TargetAdd('libpandadx8.dll', input='dxgsg8_composite.obj')
TargetAdd('libpandadx8.dll', input='libp3windisplay.dll')
TargetAdd('libpandadx8.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libpandadx8.dll', opts=['ADVAPI', 'WINGDI', 'WINKERNEL', 'WINUSER', 'WINMM', 'DX8'])
TargetAdd('libpandadx8.dll', opts=['NOVERSION', 'ADVAPI', 'WINGDI', 'WINKERNEL', 'WINUSER', 'WINMM', 'DX8'])
#
# DIRECTORY: panda/metalibs/pandadx9/
@ -2867,7 +2867,7 @@ if PkgSkip("DX9")==0 and not RUNTIME:
TargetAdd('libpandadx9.dll', input='dxgsg9_composite.obj')
TargetAdd('libpandadx9.dll', input='libp3windisplay.dll')
TargetAdd('libpandadx9.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libpandadx9.dll', opts=['ADVAPI', 'WINGDI', 'WINKERNEL', 'WINUSER', 'WINMM', 'DX9', 'NVIDIACG', 'CGDX9'])
TargetAdd('libpandadx9.dll', opts=['NOVERSION', 'ADVAPI', 'WINGDI', 'WINKERNEL', 'WINUSER', 'WINMM', 'DX9', 'NVIDIACG', 'CGDX9'])
#
# DIRECTORY: panda/src/egg/
@ -2968,7 +2968,7 @@ if (not sys.platform.startswith("win") and not RUNTIME):
TargetAdd('libpandamesa.dll', input='libp3glstuff.dll')
TargetAdd('libpandamesa.dll', input='libpandafx.dll')
TargetAdd('libpandamesa.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libpandamesa.dll', opts=['GLUT'])
TargetAdd('libpandamesa.dll', opts=['NOVERSION', 'GLUT'])
#
# DIRECTORY: panda/src/x11display/
@ -2995,7 +2995,7 @@ if (sys.platform != "win32" and sys.platform != "darwin" and not RUNTIME):
TargetAdd('libpandagl.dll', input='libp3glstuff.dll')
TargetAdd('libpandagl.dll', input='libpandafx.dll')
TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libpandagl.dll', opts=['GLUT', 'NVIDIACG', 'CGGL', 'X11', 'XF86DGA'])
TargetAdd('libpandagl.dll', opts=['NOVERSION', 'GLUT', 'NVIDIACG', 'CGGL', 'X11', 'XF86DGA'])
#
# DIRECTORY: panda/src/osxdisplay/
@ -3015,7 +3015,7 @@ if (sys.platform == 'darwin' and not RUNTIME):
TargetAdd('libpandagl.dll', input='libp3glstuff.dll')
TargetAdd('libpandagl.dll', input='libpandafx.dll')
TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libpandagl.dll', opts=['GLUT', 'NVIDIACG', 'CGGL', 'CARBON', 'AGL', 'COCOA'])
TargetAdd('libpandagl.dll', opts=['NOVERSION', 'GLUT', 'NVIDIACG', 'CGGL', 'CARBON', 'AGL', 'COCOA'])
#
# DIRECTORY: panda/src/wgldisplay/
@ -3034,7 +3034,7 @@ if (sys.platform == "win32" and not RUNTIME):
TargetAdd('libpandagl.dll', input='libp3glstuff.dll')
TargetAdd('libpandagl.dll', input='libpandafx.dll')
TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libpandagl.dll', opts=['WINGDI', 'GLUT', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM', 'NVIDIACG', 'CGGL'])
TargetAdd('libpandagl.dll', opts=['NOVERSION', 'WINGDI', 'GLUT', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM', 'NVIDIACG', 'CGGL'])
#
# DIRECTORY: panda/src/ode/