From a41279a3032730732af11706568d7923ced6461e Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Sun, 2 Oct 2005 21:07:56 +0000 Subject: [PATCH] More assorted fixes --- doc/makepanda/makepanda.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py index 6d4e6a06bd..6c40d0e6ad 100755 --- a/doc/makepanda/makepanda.py +++ b/doc/makepanda/makepanda.py @@ -1370,10 +1370,15 @@ def CompileLinkMSVC7(wdll, wlib, wobj, opts, dll, ldef): cmd = cmd + ' "' + MAXSDK[max] + '/lib/paramblk2.lib"' 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' 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,"NVIDIACG")): 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") else: exit("unknown suffix in object list.") 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. # ########################################################################