disable old chromium stuff for now

panda/metalibs/pandacr/Sources.pp

@@ -1,24 +0,0 @@
-// DIR_TYPE "metalib" indicates we are building a shared library that
-// consists mostly of references to other shared libraries.  Under
-// Windows, this directly produces a DLL (as opposed to the regular
-// src libraries, which don't produce anything but a pile of OBJ files
-// under Windows).
-
-#define DIR_TYPE metalib
-#define BUILDING_DLL BUILDING_PANDACR
-#define BUILD_DIRECTORY $[HAVE_CHROMIUM]
-
-#define COMPONENT_LIBS \
-    crgsg wcrdisplay
-
-#define LOCAL_LIBS gsgbase display express
-#define OTHER_LIBS dtoolconfig dtool
-//#define WIN_SYS_LIBS $[WIN_SYS_LIBS] 
-
-#begin metalib_target
-  #define TARGET pandacr
-
-  #define SOURCES pandacr.cxx pandacr.h
-  #define INSTALL_HEADERS pandacr.h
-
-#end metalib_target

panda/src/crgsg/Sources.pp

@@ -1,30 +0,0 @@
-#define BUILD_DIRECTORY $[HAVE_CHROMIUM]
-
-#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
-                   dtoolutil:c dtoolbase:c dtool:m
-#define USE_PACKAGES chromium
-
-#begin lib_target
-  #define TARGET crgsg
-  #define LOCAL_LIBS \
-    pandabase gsgmisc gsgbase gobj display \
-    putil linmath mathutil pnmimage
-
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
-
-  #define SOURCES \
-     crGraphicsStateGuardian.cxx \
-     config_crgsg.h crGraphicsStateGuardian.I \
-     crGraphicsStateGuardian.h crSavedFrameBuffer.I \
-     crSavedFrameBuffer.h crTextureContext.I crext.h \
-     crGeomNodeContext.I crGeomNodeContext.h  crTextureContext.h
-
-  #define INCLUDED_SOURCES \
-     config_crgsg.cxx crSavedFrameBuffer.cxx \
-     crGeomNodeContext.cxx crTextureContext.cxx 
-
-  #define INSTALL_HEADERS \
-    config_crgsg.h crGraphicsStateGuardian.I crGraphicsStateGuardian.h
-
-#end lib_target
-

panda/src/glgsg/glgsg.h

@@ -27,6 +27,7 @@
 #include "config_glgsg.h"
 
 #define GLP(name) gl##name
+#define GLUP(name) glu##name
 #define CLP(name) GL##name
 #define CLASSPREFIX_QUOTED "GL"
 #define CONFIGOBJ config_glgsg

panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -1589,12 +1589,12 @@ draw_sphere(GeomSphere *geom, GeomContext *) {
   // Draw overall
   issuer.issue_color(G_OVERALL, ci);
 
-  GLUquadricObj *sph = GLP(uNewQuadric)();
-  GLP(uQuadricNormals)(sph, wants_normals() ? (GLenum)GLU_SMOOTH : (GLenum)GLU_NONE);
-  GLP(uQuadricTexture)(sph, wants_texcoords() ? (GLenum)GL_TRUE : (GLenum)GL_FALSE);
-  GLP(uQuadricOrientation)(sph, (GLenum)GLU_OUTSIDE);
-  GLP(uQuadricDrawStyle)(sph, (GLenum)GLU_FILL);
-  //GLP(uQuadricDrawStyle)(sph, (GLenum)GLU_LINE);
+  GLUquadricObj *sph = GLUP(NewQuadric)();
+  GLUP(QuadricNormals)(sph, wants_normals() ? (GLenum)GLU_SMOOTH : (GLenum)GLU_NONE);
+  GLUP(QuadricTexture)(sph, wants_texcoords() ? (GLenum)GL_TRUE : (GLenum)GL_FALSE);
+  GLUP(QuadricOrientation)(sph, (GLenum)GLU_OUTSIDE);
+  GLUP(QuadricDrawStyle)(sph, (GLenum)GLU_FILL);
+  //GLUP(QuadricDrawStyle)(sph, (GLenum)GLU_LINE);
 
   for (int i = 0; i < nprims; i++) {
     // Draw per primitive
@@ -1609,7 +1609,7 @@ draw_sphere(GeomSphere *geom, GeomContext *) {
     LVector3f v = edge - center;
     float r = sqrt(dot(v, v));
 
-    // Since GLP(uSphere) doesn't have a center parameter, we have to use
+    // Since GLUP(Sphere) doesn't have a center parameter, we have to use
     // a matrix transform.
 
     GLP(MatrixMode)(GL_MODELVIEW);
@@ -1617,13 +1617,13 @@ draw_sphere(GeomSphere *geom, GeomContext *) {
     GLP(MultMatrixf)(LMatrix4f::translate_mat(center).get_data());
 
     // Now render the sphere using GLU calls.
-    GLP(uSphere)(sph, r, 16, 10);
+    GLUP(Sphere)(sph, r, 16, 10);
 
     GLP(MatrixMode)(GL_MODELVIEW);
     GLP(PopMatrix)();
   }
 
-  GLP(uDeleteQuadric)(sph);
+  GLUP(DeleteQuadric)(sph);
   report_gl_errors();
   DO_PSTATS_STUFF(_draw_primitive_pcollector.stop());
 }
@@ -2631,7 +2631,7 @@ report_errors_loop(int line, const char *source_file, GLenum error_code) {
   static const int max_gl_errors_reported = 20;
   int count = 0;
   while ((count < max_gl_errors_reported) && (error_code != GL_NO_ERROR)) {
-    const GLubyte *error_string = GLP(uErrorString)(error_code);
+    const GLubyte *error_string = GLUP(ErrorString)(error_code);
     if (error_string != (const GLubyte *)NULL) {
       GLCAT.error()
         << "at " << line << " of " << source_file << ": " 
@@ -2994,7 +2994,7 @@ apply_texture_immediate(Texture *tex) {
       } else 
 #endif
         {
-          GLP(uBuild2DMipmaps)(GL_TEXTURE_2D, internal_format,
+          GLUP(Build2DMipmaps)(GL_TEXTURE_2D, internal_format,
                             xsize, ysize,
                             external_format, type, image);
 #ifndef NDEBUG
@@ -3018,7 +3018,7 @@ apply_texture_immediate(Texture *tex) {
   // want to give explict error for texture creation failure
   GLenum error_code = GLP(GetError)();
   if(error_code != GL_NO_ERROR) {
-    const GLubyte *error_string = GLP(uErrorString)(error_code);
+    const GLubyte *error_string = GLUP(ErrorString)(error_code);
     GLCAT.error() << "GL texture creation failed for " << tex->get_name() << 
                         ((error_string != (const GLubyte *)NULL) ? " : " : "") << endl;
   }
@@ -3070,7 +3070,7 @@ draw_texture(TextureContext *tc, const DisplayRegion *dr) {
   GLP(MatrixMode)(GL_PROJECTION);
   GLP(PushMatrix)();
   GLP(LoadIdentity)();
-  GLP(uOrtho2D)(0, 1, 0, 1);
+  GLUP(Ortho2D)(0, 1, 0, 1);
 
   float txl, txr, tyt, tyb;
   txl = tyb = 0.0f;
@@ -3178,7 +3178,7 @@ draw_pixel_buffer(PixelBuffer *pb, const DisplayRegion *dr) {
   GLP(MatrixMode)( GL_PROJECTION );
   GLP(PushMatrix)();
   GLP(LoadIdentity)();
-  GLP(uOrtho2D)(0, props.get_x_size(),
+  GLUP(Ortho2D)(0, props.get_x_size(),
                 0, props.get_y_size());
 
 #ifdef GSG_VERBOSE

panda/src/glstuff/glstuff_src.h

@@ -23,6 +23,7 @@
 // file.
 
 // #define GLP(name): returns name prefixed by the gl prefix, e.g. gl##name
+// #define GLUP(name): returns name prefixed by the glu prefix, e.g. glu##name
 // #define CLP(name): returns name prefixed by the class prefix, e.g. GL##name
 // #define CLASSPREFIX_QUOTED: the quoted prefix of CLP, e.g. "GL"
 // #define CONFIGOBJ: a Configrc object, e.g. config_glgsg

panda/src/mesadisplay/mesagsg.h

@@ -28,9 +28,11 @@
 
 #ifdef MESA_MGL
   #define GLP(name) mgl##name
+  #define GLUP(name) mglu##name
   #define USE_MGL_NAMESPACE 1
 #else
   #define GLP(name) gl##name
+  #define GLUP(name) glu##name
 #endif
 #define CLP(name) Mesa##name
 #define CLASSPREFIX_QUOTED "Mesa"

panda/src/wcrdisplay/Sources.pp

@@ -1,37 +0,0 @@
-#define BUILD_DIRECTORY $[HAVE_WCR]
-
-#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
-                   dtoolutil:c dtoolbase:c dtool:m
-#define WIN_SYS_LIBS Imm32.lib
-#define USE_PACKAGES chromium
-
-#begin lib_target
-  #define TARGET wcrdisplay
-  #define LOCAL_LIBS \
-    crgsg display putil
-    
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx 
-  
-  #define INSTALL_HEADERS \
-     config_wcrdisplay.h wcrGraphicsPipe.h wcrGraphicsWindow.h
-
-  #define SOURCES \
-    wcrGraphicsWindow.cxx wcrext.h $[INSTALL_HEADERS]
-    
-  #define INCLUDED_SOURCES \
-    config_wcrdisplay.cxx wcrGraphicsPipe.cxx
-
-  #define IGATESCAN wcrGraphicsPipe.h
-
-#end lib_target
-
-#begin test_bin_target
-  #define TARGET test_wcr
-  #define LOCAL_LIBS \
-    putil display mathutil gobj pgraph wcrdisplay crgsg
-
-  #define SOURCES \
-    test_wcr.cxx
-
-#end test_bin_target
-