Browse Source

compile on win32

David Rose 21 years ago
parent
commit
5f2d0db993
2 changed files with 2 additions and 2 deletions
  1. 1 1
      panda/src/framework/rock_floor_src.cxx
  2. 1 1
      panda/src/framework/windowFramework.cxx

+ 1 - 1
panda/src/framework/rock_floor_src.cxx

@@ -5,7 +5,7 @@
  * bin2c -n rock_floor -static -string -o rock_floor_src.cxx /home/drose/fit/egg/rock-floor.rgb
  */
 
-static const char rock_floor[] = {
+static const unsigned char rock_floor[] = {
   0x01, 0xda, 0x01, 0x01, 0x00, 0x03, 0x01, 0x00, 0x01, 0x00, 0x00,
   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+ 1 - 1
panda/src/framework/windowFramework.cxx

@@ -642,7 +642,7 @@ load_default_model(const NodePath &parent) {
 
   // Get the default texture to apply to the triangle; it's compiled
   // into the code these days.
-  string rock_floor_string(rock_floor, rock_floor_len);
+  string rock_floor_string((const char *)rock_floor, rock_floor_len);
   istringstream rock_floor_strm(rock_floor_string);
   PNMImage rock_floor_pnm;
   if (rock_floor_pnm.read(rock_floor_strm, "rock-floor.rgb")) {