2
0
Эх сурвалжийг харах

adding a variable for maya2egg to allow for alternate binary names (e.g. maya2egg_client)

Chris Brunner 16 жил өмнө
parent
commit
f8bdc2d886

+ 2 - 0
dtool/Config.pp

@@ -963,6 +963,8 @@
 // Define this if your version of Maya is earlier than 5.0 (e.g. Maya 4.5).
 #define MAYA_PRE_5_0
 
+#define MAYA2EGG maya2egg
+
 // In the same fashion as mayaegg converter above, set softimage to egg converter as well
 #define SOFTIMAGE_LOCATION /c/Softimage/sdk_18sp2/SDK_1.8SP2/SAAPHIRE
 #defer SOFTIMAGE_LIBS SAA.lib

+ 5 - 5
dtool/pptempl/Template.models.pp

@@ -362,7 +362,7 @@ $[TAB]lwo2egg $[LWO2EGG_OPTS] -o $[target] $[source]
     #define target $[or $[TARGET],$[patsubst %$[MODEL].ma %$[MODEL].mb,$[EGG_PREFIX]%$[EGG_SUFFIX].egg,$[maya]]]
     #define source $[maya]
 $[target] : $[source]
-$[TAB]maya2egg $[MAYA2EGG_OPTS] -o $[target] $[source]
+$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -o $[target] $[source]
 
   #end maya
 #end maya_egg
@@ -373,17 +373,17 @@ $[TAB]maya2egg $[MAYA2EGG_OPTS] -o $[target] $[source]
     #define target $[EGG_PREFIX]$[POLY_MODEL].egg
     #define source $[MAYA_PREFIX]$[or $[MODEL],$[POLY_MODEL]]$[MAYA_EXTENSION]
 $[target] : $[source]
-$[TAB]maya2egg $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source]
+$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source]
   #elif $[NURBS_MODEL]
     #define target $[EGG_PREFIX]$[NURBS_MODEL].egg
     #define source $[MAYA_PREFIX]$[or $[MODEL],$[NURBS_MODEL]]$[MAYA_EXTENSION]
 $[target] : $[source]
-$[TAB]maya2egg $[MAYA2EGG_OPTS] -a model -cn "$[CHAR_NAME]" -o $[target] $[source]
+$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -a model -cn "$[CHAR_NAME]" -o $[target] $[source]
   #elif $[not $[or $[MODEL], $[POLY_MODEL], $[ANIMS]]]
     #define target $[EGG_PREFIX].egg
     #define source $[MAYA_PREFIX]$[MAYA_EXTENSION]    
 $[target] : $[source]
-$[TAB]maya2egg $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source]    
+$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[source]    
   #endif
 
 #end maya_char_egg
@@ -400,7 +400,7 @@ $[TAB]maya2egg $[MAYA2EGG_OPTS] -p -a model -cn "$[CHAR_NAME]" -o $[target] $[so
       #set end $[word 2,$[$[anim]_frames]]
     #endif
 $[target] : $[source]
-$[TAB]maya2egg $[MAYA2EGG_OPTS] -a chan -cn "$[CHAR_NAME]" -o $[target] -sf $[begin] $[if $[end],-ef $[end]] $[source]
+$[TAB]$[MAYA2EGG] $[MAYA2EGG_OPTS] -a chan -cn "$[CHAR_NAME]" -o $[target] -sf $[begin] $[if $[end],-ef $[end]] $[source]
   #end anim
 #end maya_char_egg