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

Changes for 64-bit linux

Browse Source
This commit is contained in:
Josh Yelon 2008-04-10 20:33:01 +00:00
parent aaa4e12223
commit 8b08531496
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
doc/makepanda/makepanda.py
View File

@ -170,7 +170,10 @@ if (sys.platform == "win32"):
else: else:
CheckLinkerLibraryPath() CheckLinkerLibraryPath()
COMPILER="LINUX" COMPILER="LINUX"
THIRDPARTYLIBS="thirdparty/linux-libs-a/" if (platform.architecture()[0] == "64bit"):
THIRDPARTYLIBS="thirdparty/linux-libs-x64/"
else:
THIRDPARTYLIBS="thirdparty/linux-libs-a/"
VC80CRTVERSION = 0 VC80CRTVERSION = 0
########################################################################################## ##########################################################################################
@ -312,14 +315,6 @@ 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("VRPN")==0): IncDirectory("VRPN", 'thirdparty/linux-libs-a/vrpn/include')
if (PkgSkip("FFTW")==0): IncDirectory("FFTW", 'thirdparty/linux-libs-a/fftw/include')
if (PkgSkip("FMOD")==0): IncDirectory("FMOD", 'thirdparty/linux-libs-a/fmod/include')
if (PkgSkip("FMODEX")==0): IncDirectory("FMODEX", 'thirdparty/linux-libs-a/fmodex/include')
if (PkgSkip("OPENAL")==0): IncDirectory("OPENAL", 'thirdparty/linux-libs-a/openal/include')
if (PkgSkip("NVIDIACG")==0): IncDirectory("NVIDIACG", 'thirdparty/linux-libs-a/nvidiacg/include')
if (PkgSkip("FFMPEG")==0): IncDirectory("FFMPEG", 'thirdparty/linux-libs-a/ffmpeg/include')
if (PkgSkip("ARTOOLKIT")==0): IncDirectory("ARTOOLKIT", 'thirdparty/linux-libs-a/artoolkit/include')
if (PkgSkip("FREETYPE")==0): IncDirectory("FREETYPE", '/usr/include/freetype2') if (PkgSkip("FREETYPE")==0): IncDirectory("FREETYPE", '/usr/include/freetype2')
IncDirectory("GTK2", "/usr/include/gtk-2.0") IncDirectory("GTK2", "/usr/include/gtk-2.0")
IncDirectory("GTK2", "/usr/include/cairo") IncDirectory("GTK2", "/usr/include/cairo")
@ -329,17 +324,32 @@ if (COMPILER=="LINUX"):
IncDirectory("GTK2", "/usr/lib/gtk-2.0/include") IncDirectory("GTK2", "/usr/lib/gtk-2.0/include")
IncDirectory("GTK2", "/usr/include/atk-1.0") IncDirectory("GTK2", "/usr/include/atk-1.0")
LibName("GTK2", "-lgtk-x11-2.0") LibName("GTK2", "-lgtk-x11-2.0")
if (PkgSkip("FMOD")==0): LibDirectory("FMOD", "thirdparty/linux-libs-a/fmod/lib")
if (PkgSkip("VRPN")==0): IncDirectory("VRPN", THIRDPARTYLIBS+'vrpn/include')
if (PkgSkip("FFTW")==0): IncDirectory("FFTW", THIRDPARTYLIBS+'fftw/include')
if (PkgSkip("FMOD")==0): IncDirectory("FMOD", THIRDPARTYLIBS+'fmod/include')
if (PkgSkip("FMODEX")==0): IncDirectory("FMODEX", THIRDPARTYLIBS+'fmodex/include')
if (PkgSkip("OPENAL")==0): IncDirectory("OPENAL", THIRDPARTYLIBS+'openal/include')
if (PkgSkip("NVIDIACG")==0): IncDirectory("NVIDIACG", THIRDPARTYLIBS+'nvidiacg/include')
if (PkgSkip("FFMPEG")==0): IncDirectory("FFMPEG", THIRDPARTYLIBS+'ffmpeg/include')
if (PkgSkip("ARTOOLKIT")==0): IncDirectory("ARTOOLKIT", THIRDPARTYLIBS+'artoolkit/include')
if (PkgSkip("FMOD")==0): LibDirectory("FMOD", THIRDPARTYLIBS+"fmod/lib")
if (PkgSkip("FMODEX")==0): LibDirectory("FMODEX", THIRDPARTYLIBS+"fmodex/lib")
if (PkgSkip("OPENAL")==0): LibDirectory("OPENAL", THIRDPARTYLIBS+"openal/lib")
if (PkgSkip("NVIDIACG")==0): LibDirectory("NVIDIACG", THIRDPARTYLIBS+"nvidiacg/lib")
if (PkgSkip("FFMPEG")==0): LibDirectory("FFMPEG", THIRDPARTYLIBS+"ffmpeg/lib")
if (PkgSkip("VRPN")==0): LibDirectory("VRPN", THIRDPARTYLIBS+"vrpn/lib")
if (PkgSkip("FFTW")==0): LibDirectory("FFTW", THIRDPARTYLIBS+"fftw/lib")
if (PkgSkip("ARTOOLKIT")==0): LibDirectory("ARTOOLKIT", THIRDPARTYLIBS+"artoolkit/lib")
if (PkgSkip("FMOD")==0): LibName("FMOD", "-lfmod") if (PkgSkip("FMOD")==0): LibName("FMOD", "-lfmod")
if (PkgSkip("FMODEX")==0): LibDirectory("FMODEX", "thirdparty/linux-libs-a/fmodex/lib")
if (PkgSkip("FMODEX")==0): LibName("FMODEX", "-lfmodex") if (PkgSkip("FMODEX")==0): LibName("FMODEX", "-lfmodex")
if (PkgSkip("OPENAL")==0): LibDirectory("OPENAL", "thirdparty/linux-libs-a/openal/lib")
if (PkgSkip("OPENAL")==0): LibName("OPENAL", "-lpandaopenal") if (PkgSkip("OPENAL")==0): LibName("OPENAL", "-lpandaopenal")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil")
if (PkgSkip("NVIDIACG")==0): LibDirectory("NVIDIACG", "thirdparty/linux-libs-a/nvidiacg/lib")
if (PkgSkip("NVIDIACG")==0): LibName("CGGL", "-lCgGL") if (PkgSkip("NVIDIACG")==0): LibName("CGGL", "-lCgGL")
if (PkgSkip("NVIDIACG")==0): LibName("NVIDIACG", "-lCg") if (PkgSkip("NVIDIACG")==0): LibName("NVIDIACG", "-lCg")
if (PkgSkip("FFMPEG")==0): LibDirectory("FFMPEG", "thirdparty/linux-libs-a/ffmpeg/lib")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavcodec") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavcodec")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat")
@ -350,13 +360,10 @@ if (COMPILER=="LINUX"):
if (PkgSkip("TIFF")==0): LibName("TIFF", "-ltiff") if (PkgSkip("TIFF")==0): LibName("TIFF", "-ltiff")
if (PkgSkip("OPENSSL")==0): LibName("OPENSSL", "-lssl") if (PkgSkip("OPENSSL")==0): LibName("OPENSSL", "-lssl")
if (PkgSkip("FREETYPE")==0): LibName("FREETYPE", "-lfreetype") if (PkgSkip("FREETYPE")==0): LibName("FREETYPE", "-lfreetype")
if (PkgSkip("VRPN")==0): LibDirectory("VRPN", "thirdparty/linux-libs-a/vrpn/lib")
if (PkgSkip("VRPN")==0): LibName("VRPN", "-lvrpn") if (PkgSkip("VRPN")==0): LibName("VRPN", "-lvrpn")
if (PkgSkip("VRPN")==0): LibName("VRPN", "-lquat") if (PkgSkip("VRPN")==0): LibName("VRPN", "-lquat")
if (PkgSkip("FFTW")==0): LibDirectory("FFTW", "thirdparty/linux-libs-a/fftw/lib")
if (PkgSkip("FFTW")==0): LibName("FFTW", "-lrfftw") if (PkgSkip("FFTW")==0): LibName("FFTW", "-lrfftw")
if (PkgSkip("FFTW")==0): LibName("FFTW", "-lfftw") if (PkgSkip("FFTW")==0): LibName("FFTW", "-lfftw")
if (PkgSkip("ARTOOLKIT")==0):LibDirectory("ARTOOLKIT", "thirdparty/linux-libs-a/artoolkit/lib")
if (PkgSkip("ARTOOLKIT")==0):LibName("ARTOOLKIT", "-lAR") if (PkgSkip("ARTOOLKIT")==0):LibName("ARTOOLKIT", "-lAR")
LibName("GLUT", "-lGL") LibName("GLUT", "-lGL")
LibName("GLUT", "-lGLU") LibName("GLUT", "-lGLU")
@ -471,17 +478,14 @@ def CompileIgate(woutd,wsrc,opts):
CompileCxx(wobj,woutc,opts) CompileCxx(wobj,woutc,opts)
ConditionalWriteFile(woutd,"") ConditionalWriteFile(woutd,"")
return return
cmd = "built/bin/interrogate -srcdir "+srcdir+" -I"+srcdir
if (COMPILER=="MSVC"): if (COMPILER=="MSVC"):
cmd = "built/bin/interrogate -srcdir "+srcdir+" -I"+srcdir
cmd = cmd + ' -DCPPPARSER -D__STDC__=1 -D__cplusplus -longlong __int64 -D_X86_ -DWIN32_VC -D_WIN32' cmd = cmd + ' -DCPPPARSER -D__STDC__=1 -D__cplusplus -longlong __int64 -D_X86_ -DWIN32_VC -D_WIN32'
cmd = cmd + ' -D"_declspec(param)=" -D_near -D_far -D__near -D__far -D__stdcall' cmd = cmd + ' -D"_declspec(param)=" -D_near -D_far -D__near -D__far -D__stdcall'
if (COMPILER=="LINUX"): if (COMPILER=="LINUX") and (platform.architecture()[0]=="64bit"):
cmd = "built/bin/interrogate -srcdir "+srcdir+" -I"+srcdir cmd = cmd + ' -DCPPPARSER -D__STDC__=1 -D__cplusplus -D__const=const -D_LP64'
cmd = cmd + ' -DCPPPARSER -D__STDC__=1 -D__cplusplus -D__const=const' if (COMPILER=="LINUX") and (platform.architecture()[0]=="32bit"):
if (platform.machine()=="x86_64"): cmd = cmd + ' -DCPPPARSER -D__STDC__=1 -D__cplusplus -D__const=const -D__i386__'
cmd = cmd + ' -D_LP64'
else:
cmd = cmd + ' -D__i386__'
optlevel=GetOptimizeOption(opts,OPTIMIZE) optlevel=GetOptimizeOption(opts,OPTIMIZE)
if (optlevel==1): cmd = cmd + ' ' if (optlevel==1): cmd = cmd + ' '
if (optlevel==2): cmd = cmd + ' ' if (optlevel==2): cmd = cmd + ' '
@ -3190,7 +3194,7 @@ if (PkgSkip("PANDAAPP")==0):
# DIRECTORY: pandaapp/src/httpbackup/ # DIRECTORY: pandaapp/src/httpbackup/
# #
if (PkgSkip("OPENSSL")==0) and (PkgSkip("PANDAAPP")==0): if (PkgSkip("OPENSSL")==0) and (PkgSkip("PANDAAPP")==0) and (PkgSkip("PANDATOOL")==0):
OPTS=['DIR:pandaapp/src/httpbackup', 'DIR:pandaapp/src/pandaappbase', 'OPENSSL'] OPTS=['DIR:pandaapp/src/httpbackup', 'DIR:pandaapp/src/pandaappbase', 'OPENSSL']
TargetAdd('httpbackup_backupCatalog.obj', opts=OPTS, input='backupCatalog.cxx') TargetAdd('httpbackup_backupCatalog.obj', opts=OPTS, input='backupCatalog.cxx')
TargetAdd('httpbackup_httpBackup.obj', opts=OPTS, input='httpBackup.cxx') TargetAdd('httpbackup_httpBackup.obj', opts=OPTS, input='httpBackup.cxx')
@ -3207,7 +3211,7 @@ if (PkgSkip("OPENSSL")==0) and (PkgSkip("PANDAAPP")==0):
# DIRECTORY: pandaapp/src/indexify/ # DIRECTORY: pandaapp/src/indexify/
# #
if (PkgSkip("FREETYPE")==0) and (PkgSkip("PANDAAPP")==0): if (PkgSkip("FREETYPE")==0) and (PkgSkip("PANDAAPP")==0) and (PkgSkip("PANDATOOL")==0):
OPTS=['DIR:pandaapp/src/indexify', 'FREETYPE'] OPTS=['DIR:pandaapp/src/indexify', 'FREETYPE']
TargetAdd('font-samples_default_font.obj', opts=OPTS, input='default_font.cxx') TargetAdd('font-samples_default_font.obj', opts=OPTS, input='default_font.cxx')
TargetAdd('font-samples_fontSamples.obj', opts=OPTS, input='fontSamples.cxx') TargetAdd('font-samples_fontSamples.obj', opts=OPTS, input='fontSamples.cxx')