TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert to 1.254

Browse Source
This commit is contained in:
rdb 2008-11-04 10:10:12 +00:00
parent f7a6726c50
commit d0324e3b60
1 changed files with 199 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

255
doc/makepanda/makepanda.py
View File

@ -40,7 +40,7 @@ THREADCOUNT=0
PkgListSet(MAYAVERSIONS + MAXVERSIONS + DXVERSIONS + [ PkgListSet(MAYAVERSIONS + MAXVERSIONS + DXVERSIONS + [
"PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN","FMOD","FMODEX", "PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN","FMOD","FMODEX",
"OPENAL","NVIDIACG","OPENSSL","FREETYPE","FFTW","ARTOOLKIT", "OPENAL","NVIDIACG","OPENSSL","FREETYPE","FFTW","ARTOOLKIT",
"ODE","DIRECTCAM","FFMPEG","PANDATOOL" "ODE","DIRECTCAM","OPENCV", "FFMPEG","PANDATOOL"
]) ])
CheckPandaSourceTree() CheckPandaSourceTree()
@ -145,6 +145,7 @@ MakeBuildTree()
SdkLocateDirectX() SdkLocateDirectX()
SdkLocateMaya() SdkLocateMaya()
SdkLocateMax() SdkLocateMax()
SdkLocateMacOSX()
SdkLocatePython() SdkLocatePython()
SdkLocateVisualStudio() SdkLocateVisualStudio()
SdkLocateMSPlatform() SdkLocateMSPlatform()
@ -170,7 +171,9 @@ if (sys.platform == "win32"):
else: else:
CheckLinkerLibraryPath() CheckLinkerLibraryPath()
COMPILER="LINUX" COMPILER="LINUX"
if (platform.architecture()[0] == "64bit"): if (sys.platform == "darwin"):
THIRDPARTYLIBS="thirdparty/darwin-libs-a/"
elif (platform.architecture()[0] == "64bit"):
THIRDPARTYLIBS="thirdparty/linux-libs-x64/" THIRDPARTYLIBS="thirdparty/linux-libs-x64/"
else: else:
THIRDPARTYLIBS="thirdparty/linux-libs-a/" THIRDPARTYLIBS="thirdparty/linux-libs-a/"
@ -281,20 +284,30 @@ if (COMPILER=="MSVC"):
if (COMPILER=="LINUX"): if (COMPILER=="LINUX"):
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0):
IncDirectory("ALWAYS", SDK["PYTHON"]) IncDirectory("ALWAYS", SDK["PYTHON"])
if (PkgSkip("FREETYPE")==0): IncDirectory("FREETYPE", '/usr/include/freetype2') if (sys.platform == "darwin"):
IncDirectory("GTK2", "/usr/include/gtk-2.0") if (PkgSkip("FREETYPE")==0):
IncDirectory("GTK2", "/usr/include/cairo") IncDirectory("FREETYPE", "/usr/X11R6/include")
IncDirectory("GTK2", "/usr/include/glib-2.0") IncDirectory("FREETYPE", "/usr/X11/include/freetype2/")
IncDirectory("GTK2", "/usr/lib/glib-2.0/include") IncDirectory("GLUT", "/usr/X11R6/include")
IncDirectory("GTK2", "/usr/include/pango-1.0") else:
IncDirectory("GTK2", "/usr/lib/gtk-2.0/include") if (PkgSkip("FREETYPE")==0): IncDirectory("FREETYPE", "/usr/include/freetype2")
IncDirectory("GTK2", "/usr/include/atk-1.0") IncDirectory("GTK2", "/usr/include/gtk-2.0")
if (platform.architecture()[0] == "64bit"): IncDirectory("GTK2", "/usr/include/cairo")
IncDirectory("GTK2", "/usr/lib64/glib-2.0/include") IncDirectory("GTK2", "/usr/include/glib-2.0")
IncDirectory("GTK2", "/usr/lib64/gtk-2.0/include") IncDirectory("GTK2", "/usr/lib/glib-2.0/include")
IncDirectory("GTK2", "/usr/include/pango-1.0")
IncDirectory("GTK2", "/usr/lib/gtk-2.0/include")
IncDirectory("GTK2", "/usr/include/atk-1.0")
if (platform.architecture()[0] == "64bit"):
IncDirectory("GTK2", "/usr/lib64/glib-2.0/include")
IncDirectory("GTK2", "/usr/lib64/gtk-2.0/include")
LibName("GTK2", "-lgtk-x11-2.0") LibName("GTK2", "-lgtk-x11-2.0")
for pkg in ["VRPN", "FFTW", "FMOD", "FMODEX", "OPENAL", "NVIDIACG", "FFMPEG", "ARTOOLKIT", "ODE"]: if (sys.platform == "darwin"):
pkgs = ["VRPN", "FFTW", "FMOD", "FMODEX", "ARTOOLKIT", "ODE", "OPENCV", "FFMPEG", "PNG", "JPEG", "TIFF"]
else:
pkgs = ["VRPN", "FFTW", "FMOD", "FMODEX", "ARTOOLKIT", "ODE", "OPENCV", "NVIDIACG", "FFMPEG", "OPENAL"]
for pkg in pkgs:
if (PkgSkip(pkg)==0): if (PkgSkip(pkg)==0):
if (os.path.isdir(THIRDPARTYLIBS + pkg.lower())): if (os.path.isdir(THIRDPARTYLIBS + pkg.lower())):
IncDirectory(pkg, THIRDPARTYLIBS + pkg.lower() + "/include") IncDirectory(pkg, THIRDPARTYLIBS + pkg.lower() + "/include")
@ -304,31 +317,51 @@ if (COMPILER=="LINUX"):
WARNINGS.append("I have automatically added this command-line option: --no-"+pkg.lower()) WARNINGS.append("I have automatically added this command-line option: --no-"+pkg.lower())
PkgDisable(pkg) PkgDisable(pkg)
if (PkgSkip("FMOD")==0): LibName("FMOD", "-lfmod") if (sys.platform == "darwin"):
if (PkgSkip("FMODEX")==0): LibName("FMODEX", "-lfmodex") if (PkgSkip("NVIDIACG")==0): LibName("NVIDIACG", "-framework Cg")
if (PkgSkip("OPENAL")==0): LibName("OPENAL", "-lpandaopenal") if (PkgSkip("OPENAL")==0): LibName("OPENAL", "-framework OpenAL")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil") if (PkgSkip("OPENSSL")==0): LibName("OPENSSL", "-lcrypto")
if (PkgSkip("NVIDIACG")==0): LibName("CGGL", "-lCgGL") if (PkgSkip("TIFF")==0): LibName("TIFF", "-lpandatiff")
if (PkgSkip("NVIDIACG")==0): LibName("NVIDIACG", "-lCg") else:
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat") if (PkgSkip("NVIDIACG")==0): LibName("CGGL", "-lCgGL")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavcodec") if (PkgSkip("NVIDIACG")==0): LibName("NVIDIACG", "-lCg")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat") if (PkgSkip("OPENAL")==0): LibName("OPENAL", "-lpandaopenal")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil") if (PkgSkip("TIFF")==0): LibName("TIFF", "-ltiff")
if (PkgSkip("ZLIB")==0): LibName("ZLIB", "-lz") if (PkgSkip("FMOD")==0): LibName("FMOD", "-lfmod")
if (PkgSkip("PNG")==0): LibName("PNG", "-lpng") if (PkgSkip("FMODEX")==0): LibName("FMODEX", "-lfmodex")
if (PkgSkip("JPEG")==0): LibName("JPEG", "-ljpeg") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil")
if (PkgSkip("TIFF")==0): LibName("TIFF", "-ltiff") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat")
if (PkgSkip("OPENSSL")==0): LibName("OPENSSL", "-lssl") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavcodec")
if (PkgSkip("FREETYPE")==0): LibName("FREETYPE", "-lfreetype") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat")
if (PkgSkip("VRPN")==0): LibName("VRPN", "-lvrpn") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil")
if (PkgSkip("VRPN")==0): LibName("VRPN", "-lquat") if (PkgSkip("ZLIB")==0): LibName("ZLIB", "-lz")
if (PkgSkip("FFTW")==0): LibName("FFTW", "-lrfftw") if (PkgSkip("PNG")==0): LibName("PNG", "-lpng")
if (PkgSkip("FFTW")==0): LibName("FFTW", "-lfftw") if (PkgSkip("JPEG")==0): LibName("JPEG", "-ljpeg")
if (PkgSkip("ARTOOLKIT")==0):LibName("ARTOOLKIT", "-lAR") if (PkgSkip("OPENSSL")==0): LibName("OPENSSL", "-lssl")
if (PkgSkip("ODE")==0): LibName("ODE", "-lode") if (PkgSkip("FREETYPE")==0): LibName("FREETYPE", "-lfreetype")
LibName("GLUT", "-lGL") if (PkgSkip("VRPN")==0): LibName("VRPN", "-lvrpn")
LibName("GLUT", "-lGLU") if (PkgSkip("VRPN")==0): LibName("VRPN", "-lquat")
if (PkgSkip("FFTW")==0): LibName("FFTW", "-lrfftw")
if (PkgSkip("FFTW")==0): LibName("FFTW", "-lfftw")
if (PkgSkip("ARTOOLKIT")==0): LibName("ARTOOLKIT", "-lAR")
if (PkgSkip("ODE")==0): LibName("ODE", "-lode")
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lcv")
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lcvaux")
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lcxcore")
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lhighgui")
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lml")
if (sys.platform == "darwin"):
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-framework QuickTime")
LibName("AGL", "-framework AGL")
LibName("CARBON", "-framework Carbon")
LibName("COCOA", "-framework Cocoa")
LibName("GLUT", "-framework OpenGL")
LibName("GLUT", "-lOSMesa")
# Fix for a bug in OSX:
LibName("GLUT", "-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
else:
LibName("GLUT", "-lGL")
LibName("GLUT", "-lGLU")
DefSymbol("WITHINPANDA", "WITHIN_PANDA", "1") DefSymbol("WITHINPANDA", "WITHIN_PANDA", "1")
IncDirectory("ALWAYS", "built/tmp") IncDirectory("ALWAYS", "built/tmp")
@ -404,6 +437,8 @@ def CompileCxx(obj,src,opts):
for (opt,var,val) in DEFSYMBOLS: for (opt,var,val) in DEFSYMBOLS:
if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' -D' + var + '=' + val if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' -D' + var + '=' + val
for x in ipath: cmd = cmd + ' -I' + x for x in ipath: cmd = cmd + ' -I' + x
if (sys.platform == "darwin"):
cmd = cmd + " -isysroot " + SDK["MACOSX"] + " -arch i386 -arch ppc"
optlevel = GetOptimizeOption(opts,OPTIMIZE) optlevel = GetOptimizeOption(opts,OPTIMIZE)
if (optlevel==1): cmd = cmd + " -g" if (optlevel==1): cmd = cmd + " -g"
if (optlevel==2): cmd = cmd + " -O1" if (optlevel==2): cmd = cmd + " -O1"
@ -518,9 +553,9 @@ def CompileImod(wobj, wsrc, opts):
CompileCxx(wobj,woutc,opts) CompileCxx(wobj,woutc,opts)
return return
if (COMPILER=="MSVC"): if (COMPILER=="MSVC"):
woutc = wobj[:-4]+".cxx" woutc = wobj[:-4]+".cxx"
if (COMPILER=="LINUX"): if (COMPILER=="LINUX"):
woutc = wobj[:-2]+".cxx" woutc = wobj[:-2]+".cxx"
cmd = 'built/bin/interrogate_module ' cmd = 'built/bin/interrogate_module '
cmd = cmd + ' -oc ' + woutc + ' -module ' + module + ' -library ' + library + ' -python-native ' cmd = cmd + ' -oc ' + woutc + ' -module ' + module + ' -library ' + library + ' -python-native '
for x in wsrc: cmd = cmd + ' ' + x for x in wsrc: cmd = cmd + ' ' + x
@ -540,7 +575,10 @@ def CompileLib(lib, obj, opts):
for x in obj: cmd = cmd + ' ' + x for x in obj: cmd = cmd + ' ' + x
oscmd(cmd) oscmd(cmd)
if (COMPILER=="LINUX"): if (COMPILER=="LINUX"):
cmd = 'ar cru ' + lib if sys.platform == 'darwin':
cmd = 'libtool -static -o ' + lib
else:
cmd = 'ar cru ' + lib
for x in obj: cmd=cmd + ' ' + x for x in obj: cmd=cmd + ' ' + x
oscmd(cmd) oscmd(cmd)
@ -580,7 +618,7 @@ def CompileLink(dll, obj, opts):
pass pass
else: cmd = cmd + ' ' + x else: cmd = cmd + ' ' + x
if (GetOrigExt(dll)==".exe"): if (GetOrigExt(dll)==".exe"):
cmd = cmd + ' panda/src/configfiles/pandaIcon.obj' cmd = cmd + ' panda/src/configfiles/pandaIcon.obj'
for (opt, name) in LIBNAMES: for (opt, name) in LIBNAMES:
if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' ' + name if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' ' + name
oscmd(cmd) oscmd(cmd)
@ -591,9 +629,13 @@ def CompileLink(dll, obj, opts):
oscmd(mtcmd) oscmd(mtcmd)
if (COMPILER=="LINUX"): if (COMPILER=="LINUX"):
if (GetOrigExt(dll)==".exe"): cmd = 'g++ -o ' + dll + ' -Lbuilt/lib -L/usr/X11R6/lib' if (GetOrigExt(dll)==".exe"): cmd = 'g++ -o ' + dll + ' -Lbuilt/lib -L/usr/X11R6/lib'
else: cmd = 'g++ -shared -o ' + dll + ' -Lbuilt/lib -L/usr/X11R6/lib' else:
if (sys.platform == "darwin"):
cmd = 'g++ -undefined dynamic_lookup -dynamic -dynamiclib -o ' + dll + ' -install_name built/lib/' + os.path.basename(dll) + ' -Lbuilt/lib -L/usr/X11R6/lib'
else:
cmd = 'g++ -shared -o ' + dll + ' -Lbuilt/lib -L/usr/X11R6/lib'
for x in obj: for x in obj:
if (GetOrigExt(x) != ".dat"): if (GetOrigExt(x) != ".dat"):
base = os.path.basename(x) base = os.path.basename(x)
if (base[-3:]==".so") and (base[:3]=="lib"): if (base[-3:]==".so") and (base[:3]=="lib"):
cmd = cmd + ' -l' + base[3:-3] cmd = cmd + ' -l' + base[3:-3]
@ -604,6 +646,10 @@ def CompileLink(dll, obj, opts):
for (opt, name) in LIBNAMES: for (opt, name) in LIBNAMES:
if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' ' + name if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' ' + name
cmd = cmd + " -lpthread -ldl" cmd = cmd + " -lpthread -ldl"
if (sys.platform == "darwin"):
if (PkgSkip("PYTHON")==0): cmd = cmd + " -framework Python"
cmd = cmd + " -isysroot " + SDK["MACOSX"] + " -Wl,-syslibroot," + SDK["MACOSX"] + " -arch ppc -arch i386"
oscmd(cmd) oscmd(cmd)
########################################################################################## ##########################################################################################
@ -641,7 +687,7 @@ def CompileAnything(target, inputs, opts):
elif (origsuffix==".pz"): elif (origsuffix==".pz"):
return CompileEggPZ(target, infile, opts) return CompileEggPZ(target, infile, opts)
elif (origsuffix==".obj"): elif (origsuffix==".obj"):
if (infile.endswith(".cxx") or infile.endswith(".c")): if (infile.endswith(".cxx") or infile.endswith(".c") or infile.endswith(".mm")):
return CompileCxx(target, infile, opts) return CompileCxx(target, infile, opts)
elif (infile.endswith(".yxx")): elif (infile.endswith(".yxx")):
return CompileBison(target, infile, opts) return CompileBison(target, infile, opts)
@ -738,6 +784,7 @@ DTOOL_CONFIG=[
("HAVE_SYS_SOUNDCARD_H", 'UNDEF', '1'), ("HAVE_SYS_SOUNDCARD_H", 'UNDEF', '1'),
("HAVE_RTTI", '1', '1'), ("HAVE_RTTI", '1', '1'),
("IS_LINUX", 'UNDEF', '1'), ("IS_LINUX", 'UNDEF', '1'),
("IS_OSX", 'UNDEF', 'UNDEF'),
("GLOBAL_OPERATOR_NEW_EXCEPTIONS", 'UNDEF', '1'), ("GLOBAL_OPERATOR_NEW_EXCEPTIONS", 'UNDEF', '1'),
("USE_STL_ALLOCATOR", '1', '1'), ("USE_STL_ALLOCATOR", '1', '1'),
("USE_MEMORY_DLMALLOC", '1', 'UNDEF'), ("USE_MEMORY_DLMALLOC", '1', 'UNDEF'),
@ -762,7 +809,9 @@ DTOOL_CONFIG=[
("HAVE_FFMPEG", 'UNDEF', 'UNDEF'), ("HAVE_FFMPEG", 'UNDEF', 'UNDEF'),
("HAVE_ARTOOLKIT", 'UNDEF', 'UNDEF'), ("HAVE_ARTOOLKIT", 'UNDEF', 'UNDEF'),
("HAVE_ODE", 'UNDEF', 'UNDEF'), ("HAVE_ODE", 'UNDEF', 'UNDEF'),
("HAVE_OPENCV", 'UNDEF', 'UNDEF'),
("HAVE_DIRECTCAM", 'UNDEF', 'UNDEF'), ("HAVE_DIRECTCAM", 'UNDEF', 'UNDEF'),
("HAVE_OPENAL_FRAMEWORK", 'UNDEF', 'UNDEF'),
("PRC_SAVE_DESCRIPTIONS", '1', '1'), ("PRC_SAVE_DESCRIPTIONS", '1', '1'),
] ]
@ -808,6 +857,20 @@ def WriteConfigSettings():
dtool_config["HAVE_CGGL"] = '1' dtool_config["HAVE_CGGL"] = '1'
dtool_config["HAVE_CGDX9"] = '1' dtool_config["HAVE_CGDX9"] = '1'
if (sys.platform == "darwin"):
dtool_config["PYTHON_FRAMEWORK"] = 'Python'
dtool_config["HAVE_MALLOC_H"] = 'UNDEF'
dtool_config["HAVE_SYS_MALLOC_H"] = '1'
dtool_config["HAVE_OPENAL_FRAMEWORK"] = '1'
dtool_config["IS_LINUX"] = 'UNDEF'
dtool_config["IS_OSX"] = '1'
dtool_config["HAVE_PROC_SELF_EXE"] = 'UNDEF'
dtool_config["HAVE_PROC_SELF_MAPS"] = 'UNDEF'
dtool_config["HAVE_PROC_SELF_CMDLINE"] = 'UNDEF'
dtool_config["HAVE_PROC_SELF_ENVIRON"] = 'UNDEF'
# OSX still doesn't always recognize the <auto> correctly.
prc_parameters["DEFAULT_PRC_DIR"] = '"/Applications/Panda3D/' + VERSION + '/etc"'
if (OPTIMIZE <= 3): if (OPTIMIZE <= 3):
if (dtool_config["HAVE_NET"] != 'UNDEF'): if (dtool_config["HAVE_NET"] != 'UNDEF'):
dtool_config["DO_PSTATS"] = '1' dtool_config["DO_PSTATS"] = '1'
@ -988,7 +1051,7 @@ CopyFile("built/", "doc/LICENSE")
CopyFile("built/", "doc/ReleaseNotes") CopyFile("built/", "doc/ReleaseNotes")
CopyAllFiles("built/plugins/", "pandatool/src/scripts/", ".mel") CopyAllFiles("built/plugins/", "pandatool/src/scripts/", ".mel")
CopyAllFiles("built/plugins/", "pandatool/src/scripts/", ".ms") CopyAllFiles("built/plugins/", "pandatool/src/scripts/", ".ms")
if (PkgSkip("PYTHON")==0): if (PkgSkip("PYTHON")==0 and os.path.isdir("thirdparty/Pmw")):
CopyTree('built/Pmw', 'thirdparty/Pmw') CopyTree('built/Pmw', 'thirdparty/Pmw')
ConditionalWriteFile('built/include/ctl3d.h', '/* dummy file to make MAX happy */') ConditionalWriteFile('built/include/ctl3d.h', '/* dummy file to make MAX happy */')
@ -1082,10 +1145,12 @@ CopyAllHeaders('panda/metalibs/pandafx')
CopyAllHeaders('panda/src/glstuff') CopyAllHeaders('panda/src/glstuff')
CopyAllHeaders('panda/src/glgsg') CopyAllHeaders('panda/src/glgsg')
CopyAllHeaders('panda/metalibs/pandaegg') CopyAllHeaders('panda/metalibs/pandaegg')
if (sys.platform != "win32"): if (sys.platform == "win32"):
CopyAllHeaders('panda/src/glxdisplay')
else:
CopyAllHeaders('panda/src/wgldisplay') CopyAllHeaders('panda/src/wgldisplay')
elif (sys.platform == "darwin"):
CopyAllHeaders('panda/src/osxdisplay')
else:
CopyAllHeaders('panda/src/glxdisplay')
CopyAllHeaders('panda/metalibs/pandagl') CopyAllHeaders('panda/metalibs/pandagl')
CopyAllHeaders('panda/src/physics') CopyAllHeaders('panda/src/physics')
@ -1651,7 +1716,7 @@ TargetAdd('libmovies_igate.obj', input='libmovies.in', opts=["DEPENDENCYONLY"])
# DIRECTORY: panda/src/grutil/ # DIRECTORY: panda/src/grutil/
# #
OPTS=['DIR:panda/src/grutil', 'BUILDING:PANDA', 'FFMPEG', 'ARTOOLKIT'] OPTS=['DIR:panda/src/grutil', 'BUILDING:PANDA', 'FFMPEG', 'ARTOOLKIT', 'OPENCV']
TargetAdd('grutil_multitexReducer.obj', opts=OPTS, input='multitexReducer.cxx') TargetAdd('grutil_multitexReducer.obj', opts=OPTS, input='multitexReducer.cxx')
TargetAdd('grutil_composite1.obj', opts=OPTS, input='grutil_composite1.cxx') TargetAdd('grutil_composite1.obj', opts=OPTS, input='grutil_composite1.cxx')
TargetAdd('grutil_composite2.obj', opts=OPTS, input='grutil_composite2.cxx') TargetAdd('grutil_composite2.obj', opts=OPTS, input='grutil_composite2.cxx')
@ -1740,7 +1805,7 @@ if (PkgSkip("VRPN")==0):
OPTS=['DIR:panda/metalibs/panda', 'BUILDING:PANDA', 'VRPN', 'JPEG', 'PNG', OPTS=['DIR:panda/metalibs/panda', 'BUILDING:PANDA', 'VRPN', 'JPEG', 'PNG',
'TIFF', 'ZLIB', 'OPENSSL', 'FREETYPE', 'FFTW', 'ADVAPI', 'WINSOCK2', 'TIFF', 'ZLIB', 'OPENSSL', 'FREETYPE', 'FFTW', 'ADVAPI', 'WINSOCK2',
'NVIDIACG', 'WINUSER', 'WINMM', 'FFMPEG', 'DIRECTCAM', 'ARTOOLKIT'] 'NVIDIACG', 'WINUSER', 'WINMM', 'FFMPEG', 'DIRECTCAM', 'ARTOOLKIT', 'OPENCV']
TargetAdd('panda_panda.obj', opts=OPTS, input='panda.cxx') TargetAdd('panda_panda.obj', opts=OPTS, input='panda.cxx')
@ -2033,7 +2098,6 @@ if (sys.platform == "win32"):
TargetAdd('libp3windisplay.dll', input=COMMON_PANDA_LIBS) TargetAdd('libp3windisplay.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libp3windisplay.dll', opts=['WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM']) TargetAdd('libp3windisplay.dll', opts=['WINIMM', 'WINGDI', 'WINKERNEL', 'WINOLDNAMES', 'WINUSER', 'WINMM'])
# #
# DIRECTORY: panda/metalibs/pandadx8/ # DIRECTORY: panda/metalibs/pandadx8/
# #
@ -2206,7 +2270,7 @@ if (sys.platform != "win32"):
# DIRECTORY: panda/src/glxdisplay/ # DIRECTORY: panda/src/glxdisplay/
# #
if (sys.platform != "win32"): if (sys.platform != "win32" and sys.platform != "darwin"):
OPTS=['DIR:panda/src/glxdisplay', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL'] OPTS=['DIR:panda/src/glxdisplay', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL']
TargetAdd('glxdisplay_composite.obj', opts=OPTS, input='glxdisplay_composite.cxx') TargetAdd('glxdisplay_composite.obj', opts=OPTS, input='glxdisplay_composite.cxx')
OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL'] OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL']
@ -2220,6 +2284,24 @@ if (sys.platform != "win32"):
TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS) TargetAdd('libpandagl.dll', input=COMMON_PANDA_LIBS)
TargetAdd('libpandagl.dll', opts=['GLUT', 'NVIDIACG', 'CGGL']) TargetAdd('libpandagl.dll', opts=['GLUT', 'NVIDIACG', 'CGGL'])
#
# DIRECTORY: panda/src/osxdisplay/
#
if (sys.platform == 'darwin'):
OPTS=['DIR:panda/src/osxdisplay', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL']
TargetAdd('osxdisplay_composite.obj', opts=OPTS, input='osxdisplay_composite.mm')
OPTS=['DIR:panda/metalibs/pandagl', 'BUILDING:PANDAGLUT', 'GLUT', 'NVIDIACG', 'CGGL']
TargetAdd('pandagl_pandagl.obj', opts=OPTS, input='pandagl.cxx')
TargetAdd('libpandagl.dll', input='pandagl_pandagl.obj')
TargetAdd('libpandagl.dll', input='glgsg_config_glgsg.obj')
TargetAdd('libpandagl.dll', input='glgsg_glgsg.obj')
TargetAdd('libpandagl.dll', input='osxdisplay_composite.obj')
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'])
# #
# DIRECTORY: panda/src/wgldisplay/ # DIRECTORY: panda/src/wgldisplay/
# #
@ -3181,7 +3263,7 @@ if (PkgSkip("PANDATOOL")==0):
# DIRECTORY: pandatool/src/gtk-stats/ # DIRECTORY: pandatool/src/gtk-stats/
# #
if (PkgSkip("PANDATOOL")==0): if (PkgSkip("PANDATOOL")==0 and sys.platform != "darwin"):
if (sys.platform == "win32"): if (sys.platform == "win32"):
OPTS=['DIR:pandatool/src/win-stats'] OPTS=['DIR:pandatool/src/win-stats']
TargetAdd('pstats_composite1.obj', opts=OPTS, input='winstats_composite1.cxx') TargetAdd('pstats_composite1.obj', opts=OPTS, input='winstats_composite1.cxx')
@ -3377,6 +3459,7 @@ if (PkgSkip("PYTHON")==0):
# #
# Under windows, we can build an 'exe' package using NSIS # Under windows, we can build an 'exe' package using NSIS
# Under linux, we can build a 'deb' package or an 'rpm' package. # Under linux, we can build a 'deb' package or an 'rpm' package.
# Under OSX, we can make a 'dmg' package.
# #
########################################################################################## ##########################################################################################
@ -3473,8 +3556,8 @@ def MakeInstallerLinux():
oscmd("cp --recursive built/pandac linuxroot/usr/share/panda3d/pandac") oscmd("cp --recursive built/pandac linuxroot/usr/share/panda3d/pandac")
oscmd("cp built/direct/__init__.py linuxroot/usr/share/panda3d/direct/__init__.py") oscmd("cp built/direct/__init__.py linuxroot/usr/share/panda3d/direct/__init__.py")
oscmd("cp --recursive built/models linuxroot/usr/share/panda3d/models") oscmd("cp --recursive built/models linuxroot/usr/share/panda3d/models")
if os.path.isdir("built/Pmw"): oscmd("cp --recursive built/Pmw linuxroot/usr/share/panda3d/Pmw") if (os.path.isdir("built/Pmw")): oscmd("cp --recursive built/Pmw linuxroot/usr/share/panda3d/Pmw")
if os.path.isdir("samples"): oscmd("cp --recursive samples linuxroot/usr/share/panda3d/samples") if (os.path.isdir("samples")): oscmd("cp --recursive samples linuxroot/usr/share/panda3d/samples")
oscmd("cp doc/LICENSE linuxroot/usr/share/panda3d/LICENSE") oscmd("cp doc/LICENSE linuxroot/usr/share/panda3d/LICENSE")
oscmd("cp doc/LICENSE linuxroot/usr/include/panda3d/LICENSE") oscmd("cp doc/LICENSE linuxroot/usr/include/panda3d/LICENSE")
oscmd("cp doc/ReleaseNotes linuxroot/usr/share/panda3d/ReleaseNotes") oscmd("cp doc/ReleaseNotes linuxroot/usr/share/panda3d/ReleaseNotes")
@ -3490,6 +3573,7 @@ def MakeInstallerLinux():
compileall.compile_dir("linuxroot/usr/share/panda3d/Pmw") compileall.compile_dir("linuxroot/usr/share/panda3d/Pmw")
DeleteCVS("linuxroot") DeleteCVS("linuxroot")
oscmd("chmod -R 555 linuxroot/usr/share/panda3d") oscmd("chmod -R 555 linuxroot/usr/share/panda3d")
oscmd("chmod -R 444 linuxroot/usr/share/panda3d/models")
if (os.path.exists("/usr/bin/dpkg-deb")): if (os.path.exists("/usr/bin/dpkg-deb")):
txt = INSTALLER_DEB_FILE[1:].replace("VERSION",str(VERSION)).replace("PYTHONV",PYTHONV).replace("ARCH",ARCH) txt = INSTALLER_DEB_FILE[1:].replace("VERSION",str(VERSION)).replace("PYTHONV",PYTHONV).replace("ARCH",ARCH)
@ -3517,12 +3601,68 @@ def MakeInstallerLinux():
# oscmd("chmod -R 755 linuxroot") # oscmd("chmod -R 755 linuxroot")
# oscmd("rm -rf linuxroot data.tar.gz control.tar.gz panda3d.spec "+ARCH) # oscmd("rm -rf linuxroot data.tar.gz control.tar.gz panda3d.spec "+ARCH)
def MakeInstallerOSX():
import compileall
PYTHONV=SDK["PYTHONVERSION"].replace("python", "").strip()
if (os.path.isfile("Panda3D-tpl-rw.dmg")): oscmd("rm -f Panda3D-tpl-rw.dmg")
if (os.path.isdir("Panda3D-tpl-rw")):
oscmd("hdiutil detach Panda3D-tpl-rw -quiet -force", True)
oscmd("rm -rf Panda3D-tpl-rw")
if (os.path.isfile("Panda3D-%s.dmg" % VERSION)): oscmd("rm -f Panda3D-%s.dmg" % VERSION)
oscmd("hdiutil convert -format UDRW -o Panda3D-tpl-rw.dmg makepanda/Panda3D-tpl.dmg", True)
if (not os.path.exists("Panda3D-tpl-rw.dmg")): exit()
oscmd("mkdir Panda3D-tpl-rw")
oscmd("hdiutil attach Panda3D-tpl-rw.dmg -noautoopen -quiet -mountpoint Panda3D-tpl-rw", True)
if (not os.path.exists("Panda3D-tpl-rw")): exit()
try:
oscmd("mkdir -p Panda3D-tpl-rw/Panda3D/%s/etc" % VERSION)
oscmd("mkdir -p Panda3D-tpl-rw/Panda3D/%s/lib" % VERSION)
oscmd("mkdir -p Panda3D-tpl-rw/Panda3D/%s/bin" % VERSION)
oscmd("sed -e 's@\\$1@%s@' < direct/src/directscripts/profilepaths-osx.command >> Panda3D-tpl-rw/panda3dpaths.command" % VERSION)
oscmd("sed -e 's@model-cache-@# model-cache-@' -e 's@$THIS_PRC_DIR/[.][.]@/Applications/Panda3D/%s@' < built/etc/Config.prc > Panda3D-tpl-rw/Panda3D/%s/etc/Config.prc" % (VERSION, VERSION))
# Append the plugin-path to the Config.prc.
f = open("Panda3D-tpl-rw/Panda3D/%s/etc/Config.prc" % VERSION, "a")
f.write("\nplugin-path /Applications/Panda3D/%s/lib\n" % VERSION)
f.close()
oscmd("cp built/etc/Confauto.prc Panda3D-tpl-rw/Panda3D/%s/etc/Confauto.prc" % VERSION)
oscmd("cp -R built/include Panda3D-tpl-rw/Panda3D/%s/include" % VERSION)
oscmd("cp -R direct Panda3D-tpl-rw/Panda3D/%s/lib/direct" % VERSION)
oscmd("cp -R built/pandac Panda3D-tpl-rw/Panda3D/%s/lib/pandac" % VERSION)
oscmd("cp built/direct/__init__.py Panda3D-tpl-rw/Panda3D/%s/lib/direct/__init__.py" % VERSION)
oscmd("cp -R built/models Panda3D-tpl-rw/Panda3D/%s/models" % VERSION)
oscmd("cp -R doc/LICENSE Panda3D-tpl-rw/Panda3D/%s/LICENSE" % VERSION)
oscmd("cp -R doc/ReleaseNotes Panda3D-tpl-rw/Panda3D/%s/ReleaseNotes" % VERSION)
oscmd("cp -R built/bin/* Panda3D-tpl-rw/Panda3D/%s/bin/" % VERSION)
if os.path.isdir("samples"): oscmd("cp -R samples Panda3D-tpl-rw/Panda3D/%s/samples" % VERSION)
if os.path.isdir("built/Pmw"): oscmd("cp -R built/Pmw Panda3D-tpl-rw/Panda3D/%s/lib/Pmw" % VERSION)
for base in os.listdir("built/lib"):
oscmd("cp built/lib/"+base+" Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/"+base)
for base in os.listdir("Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/direct/src"):
if ((base != "extensions") and (base != "extensions_native")):
compileall.compile_dir("Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/direct/src/"+base)
compileall.compile_dir("Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/Pmw")
oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/direct")
oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/pandac")
oscmd("chmod -R 444 Panda3D-tpl-rw/Panda3D/"+VERSION+"/models")
if os.path.isdir("samples"): oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/samples")
if os.path.isdir("built/Pmw"): oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/Pmw")
except: # Make sure the dmg gets unmounted even when error occurs
oscmd("hdiutil detach Panda3D-tpl-rw -quiet -force", True)
oscmd("rm -f Panda3D-tpl-rw.dmg")
raise
oscmd("hdiutil detach Panda3D-tpl-rw -quiet -force", True)
oscmd("hdiutil convert -format UDBZ -o Panda3D-"+VERSION+".dmg Panda3D-tpl-rw.dmg", True)
if (not os.path.exists("Panda3D-%s.dmg" % VERSION)): exit()
oscmd("rm -f Panda3D-tpl-rw.dmg")
oscmd("rm -rf Panda3D-tpl-rw")
if (INSTALLER != 0): if (INSTALLER != 0):
if (sys.platform == "win32"): if (sys.platform == "win32"):
MakeInstallerNSIS("Panda3D-"+VERSION+".exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) MakeInstallerNSIS("Panda3D-"+VERSION+".exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION)
elif (sys.platform == "linux2"): elif (sys.platform == "linux2"):
MakeInstallerLinux() MakeInstallerLinux()
elif (sys.platform == "darwin"):
MakeInstallerOSX()
else: else:
exit("Do not know how to make an installer for this platform") exit("Do not know how to make an installer for this platform")
@ -3537,4 +3677,3 @@ SaveDependencyCache()
WARNINGS.append("Elapsed Time: "+PrettyTime(time.time() - STARTTIME)) WARNINGS.append("Elapsed Time: "+PrettyTime(time.time() - STARTTIME))
printStatus("Makepanda Final Status Report", WARNINGS) printStatus("Makepanda Final Status Report", WARNINGS)