Changeset 1523Tweet

Timestamp:

Jun 24, 2012, 9:10:14 PM (11 years ago)

Author:

sam

Message:

build: OS X compilation fixes: use GL_INVALID_ENUM instead of GL_INVALID_INDEX
and support automake 1.12 in the bootstrap script.

Location:

trunk

Files:

• bootstrap (modified) (1 diff)
• src/gpu/framebuffer.cpp (modified) (2 diffs)

trunk/bootstrap

@@ -47 +47 @@
 # Check for automake
 amvers="no"
-for v in 11 10 9 8 7 6 5; do
+for v in 12 11 10 9 8 7 6 5; do
   if automake-1.${v} --version >/dev/null 2>&1; then
     amvers="-1.${v}"

trunk/src/gpu/framebuffer.cpp

@@ -83 +83 @@
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                            GL_TEXTURE_2D, m_data->m_texture, 0);
-    m_data->m_depth = GL_INVALID_INDEX;
-    if (depth != GL_INVALID_INDEX)
+    m_data->m_depth = GL_INVALID_ENUM;
+    if (depth != GL_INVALID_ENUM)
     {
         glGenRenderbuffers(1, &m_data->m_depth);
@@ -107 +107 @@
     glDeleteFramebuffers(1, &m_data->m_fbo);
     glDeleteTextures(1, &m_data->m_texture);
-    if (m_data->m_depth != GL_INVALID_INDEX)
+    if (m_data->m_depth != GL_INVALID_ENUM)
         glDeleteRenderbuffers(1, &m_data->m_depth);
 #else