misc fixes

doc/makepanda/makepanda.bat

@@ -1,28 +1,28 @@
-@echo off
-
-REM
-REM Verify that we can find the 'makepanda' python script
-REM and the python interpreter.  If we can find both, then
-REM run 'makepanda'.
-REM
-
-if not exist makepanda\makepanda.py goto :missing1
-if not exist thirdparty\win-python\python.exe goto :missing2
-thirdparty\win-python\python.exe makepanda\makepanda.py %*
-goto done
-
-
-:missing1
-  echo You need to change directory to the root of the panda source tree
-  echo before invoking makepanda.  For further install instructions, read 
-  echo the installation instructions in the file doc/INSTALL-MK.
-  goto done
-
-:missing2
-  echo You seem to be missing the 'thirdparty' directory.  You probably checked
-  echo the source code out from sourceforge.  The sourceforge repository is
-  echo missing the 'thirdparty' directory.  You will need to supplement the
-  echo code by downloading the 'thirdparty' directory from panda3d.etc.cmu.edu
-  goto done
-
-:done
+@echo off
+
+REM
+REM Verify that we can find the 'makepanda' python script
+REM and the python interpreter.  If we can find both, then
+REM run 'makepanda'.
+REM
+
+if not exist makepanda\makepanda.py goto :missing1
+if not exist thirdparty\win-python\python.exe goto :missing2
+thirdparty\win-python\python.exe makepanda\makepanda.py %*
+if errorlevel 1 if x%1 == x--slavebuild exit 1
+goto done
+
+:missing1
+  echo You need to change directory to the root of the panda source tree
+  echo before invoking makepanda.  For further install instructions, read 
+  echo the installation instructions in the file doc/INSTALL-MK.
+  goto done
+
+:missing2
+  echo You seem to be missing the 'thirdparty' directory.  You probably checked
+  echo the source code out from sourceforge.  The sourceforge repository is
+  echo missing the 'thirdparty' directory.  You will need to supplement the
+  echo code by downloading the 'thirdparty' directory from panda3d.etc.cmu.edu
+  goto done
+
+:done

panda/src/framework/framework_composite.cxx

@@ -0,0 +1 @@
+#include "framework_composite1.cxx"

panda/src/framework/framework_composite1.cxx

@@ -0,0 +1,3 @@
+#include "config_framework.cxx"
+#include "pandaFramework.cxx"
+#include "windowFramework.cxx"

panda/src/pnmtext/pnmtext_composite.cxx

@@ -0,0 +1 @@
+#include "pnmtext_composite1.cxx"

panda/src/pnmtext/pnmtext_composite1.cxx

@@ -0,0 +1,4 @@
+#include "config_pnmtext.cxx"
+#include "freetypeFont.cxx"
+#include "pnmTextGlyph.cxx"
+#include "pnmTextMaker.cxx"

pandatool/src/maya/mayaShader.cxx

@@ -189,7 +189,7 @@ read_surface_shader(MObject shader) {
 
     MayaShaderColorDef *color_p = new MayaShaderColorDef;
     for (size_t i = 0; i < color_pa.length(); i++) {
-      maya_cat.spam() << "color_pa[" << i << "]:" << color_pa[i].name() << endl;
+      maya_cat.spam() << "color_pa[" << i << "]:" << color_pa[i].name().asChar() << endl;
       color_p->read_surface_color(this, color_pa[0].node());
     }
 

pandatool/src/maya/mayaShaderColorDef.cxx

@@ -248,7 +248,7 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
       _texture_filename = Filename::from_os_specific(filename);
       if (_texture_filename.is_directory()) {
         maya_cat.warning()
-          << "Shader " << shader->get_name() 
+          << "Shader " << shader->get_name()
           << " references texture filename " << filename
           << " which is a directory; clearing.\n";
         _has_texture = false;
@@ -334,14 +334,14 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
         string pla_name = pla[j].name().asChar();
         // sometimes, by default, maya gives a outAlpha on subsequent plugs, ignore that
         if (pla_name.find("outAlpha") != string::npos) {
-          maya_cat.debug() << pl.name() << " ignoring: " << pla_name << endl;
+          maya_cat.debug() << pl.name().asChar() << " ignoring: " << pla_name << endl;
           // In this case the artist is wanting to retain alpha at the result
           // So make sure that this alpha is not thrown out by the egg file
           _alpha_is_luminance = true;
           continue;
         }
         if (!first) {
-          maya_cat.debug() << pl.name() << " next:connectedTo: " << pla_name << endl;
+          maya_cat.debug() << pl.name().asChar() << " next:connectedTo: " << pla_name << endl;
           MayaShaderColorDef *color_p = new MayaShaderColorDef;
           color_p->read_surface_color(shader, pla[j].node());
           color_p->_texture_name.assign(pla[j].name().asChar());
@@ -352,7 +352,7 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
           maya_cat.debug() << "uv_name : " << color_p->_texture_name << endl;
         }
         else {
-          maya_cat.debug() << pl.name() << " first:connectedTo: " << pla_name << endl;
+          maya_cat.debug() << pl.name().asChar() << " first:connectedTo: " << pla_name << endl;
           read_surface_color(shader, pla[j].node());
           _texture_name.assign(pla[j].name().asChar());
           size_t loc = _texture_name.find('.',0);
@@ -367,7 +367,7 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
         MPlug pl_temp = pla[j];
         MPlugArray pla_temp;
         pl_temp.connectedTo(pla_temp, true, false);
-        maya_cat.debug() << pl_temp.name() << " connectedTo:" << pla_temp.length() << " plugs\n";
+        maya_cat.debug() << pl_temp.name().asChar() << " connectedTo:" << pla_temp.length() << " plugs\n";
       }
       /*
       string blah;

pandatool/src/maya/maya_funcs.cxx

@@ -545,9 +545,9 @@ describe_compound_attribute(MObject &node) {
       if (status) {
         MString blah;
         status = enu.getDefault(blah);
-        maya_cat.info() << "found a string :" << blah << endl;
+        maya_cat.info() << "found a string :" << blah.asChar() << endl;
         MPlug plug = MPlug(node, child);
-        maya_cat.info() << "plug name" << plug.name() << endl;
+        maya_cat.info() << "plug name" << plug.name().asChar() << endl;
       }
     }
   }

pandatool/src/mayaegg/mayaToEggConverter.cxx

@@ -1657,7 +1657,7 @@ make_polyset(MayaNodeDesc *node_desc, const MDagPath &dag_path,
     //return;
   }
   for (size_t ui=0; ui<maya_uvset_names.length(); ++ui) {
-    mayaegg_cat.debug() << "uv_set[" << ui << "] name: " << maya_uvset_names[ui] << endl;
+    mayaegg_cat.debug() << "uv_set[" << ui << "] name: " << maya_uvset_names[ui].asChar() << endl;
     uvset_names.push_back(maya_uvset_names[ui].asChar());
   }