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

More assorted fixes

Browse Source
This commit is contained in:
Josh Yelon 2005-10-02 21:07:56 +00:00
parent b4b6916073
commit a41279a303
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/makepanda/makepanda.py
View File

@ -1370,10 +1370,15 @@ def CompileLinkMSVC7(wdll, wlib, wobj, opts, dll, ldef):
cmd = cmd + ' "' + MAXSDK[max] + '/lib/paramblk2.lib"' cmd = cmd + ' "' + MAXSDK[max] + '/lib/paramblk2.lib"'
oscmd(cmd) oscmd(cmd)
def CompileLinkLINUXA(wdll, wobj, opts, dll, ldef): def CompileLinkLINUXA(wdll, obj, wobj, opts, dll, ldef):
if (dll[-4:]==".exe"): cmd = 'g++ -o ' + wdll + ' -Lbuilt/lib -L/usr/X11R6/lib' if (dll[-4:]==".exe"): cmd = 'g++ -o ' + wdll + ' -Lbuilt/lib -L/usr/X11R6/lib'
else: cmd = 'g++ -shared -o ' + wdll + ' -Lbuilt/lib -L/usr/X11R6/lib' else: cmd = 'g++ -shared -o ' + wdll + ' -Lbuilt/lib -L/usr/X11R6/lib'
for x in wobj: cmd = cmd+' '+x for x in obj:
suffix = x[-4:]
if (suffix==".obj"): cmd = cmd + ' built/tmp/' + x[:-4] + '.o'
elif (suffix==".dll"): cmd = cmd + ' -l' + x[3:-4]
elif (suffix==".lib"): cmd = cmd + ' built/lib/' + x[:-4] + '.a'
elif (suffix==".ilb"): cmd = cmd + ' built/tmp/' + x[:-4] + '.a'
if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -Lthirdparty/linux-libs-a/fmod/lib -lfmod-3.74' if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -Lthirdparty/linux-libs-a/fmod/lib -lfmod-3.74'
if (PkgSelected(opts,"NVIDIACG")): if (PkgSelected(opts,"NVIDIACG")):
cmd = cmd + ' -Lthirdparty/nvidiacg/lib ' cmd = cmd + ' -Lthirdparty/nvidiacg/lib '
@ -1429,7 +1434,7 @@ def EnqueueLink(dll=0, obj=[], opts=[], xdep=[], ldef=0):
elif (suffix==".ilb"): wobj.append("built/tmp/"+x[:-4]+".a") elif (suffix==".ilb"): wobj.append("built/tmp/"+x[:-4]+".a")
else: exit("unknown suffix in object list.") else: exit("unknown suffix in object list.")
if (SLAVEBUILD!=0) and (SLAVEBUILD!=wdll): return if (SLAVEBUILD!=0) and (SLAVEBUILD!=wdll): return
DependencyQueue(CompileLinkLINUXA, [wdll, wobj, opts, dll, ldef], [wdll], wobj) DependencyQueue(CompileLinkLINUXA, [wdll, obj, wobj, opts, dll, ldef], [wdll], wobj)
########################################################################################## ##########################################################################################
@ -1888,7 +1893,7 @@ if (SLAVEBUILD==0):
######################################################################## ########################################################################
# #
# Copy header files to the PREFIX/include/parser-inc directory. # Copy header files to the built/include/parser-inc directory.
# #
######################################################################## ########################################################################