Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
63694ae8e5
2 changed files with 10 additions and 1 deletions
  1. 4 1
      dtool/src/build/Makefile.bin.vars
  2. 6 0
      pandatool/src/maya/maya2egg_script

+ 4 - 1
dtool/src/build/Makefile.bin.vars

@@ -107,10 +107,13 @@ ifeq (WIN32,$(PENV))
   endif
 endif
 
-
+ifeq ($(LD),ld)
+  LD := $(SET_LD)
+endif
 ifeq ($(LD),)
   LD := $(SET_LD)
 endif
+
 LDFLAGS += $(SET_LDFLAGS)
 
 ARFLAGS = ruv

+ 6 - 0
pandatool/src/maya/maya2egg_script

@@ -1,4 +1,10 @@
 #! /bin/sh
 MAYA_LOCATION=xxx
 export MAYA_LOCATION
+if test "$LD_LIBRARY_PATH" = ""; then
+  LD_LIBRARY_PATH=$MAYA_LOCATION/lib
+else
+  LD_LIBRARY_PATH=$MAYA_LOCATION/lib:$LD_LIBRARY_PATH
+fi
+export LD_LIBRARY_PATH
 exec `dirname $0`/maya2egg_bin $*