Browse Source

ios: fix iOS build by adding missing files to XCode project.

legacy
Sam Hocevar sam 13 years ago
parent
commit
ba10e59e45
2 changed files with 9 additions and 3 deletions
  1. +6
    -0
      configure.ac
  2. +3
    -3
      src/debug/quad.cpp

+ 6
- 0
configure.ac View File

@@ -112,6 +112,12 @@ PKG_CHECK_MODULES(GLES2, glesv2,
GL_CFLAGS="${GL_CFLAGS} ${GLES2_CFLAGS}" GL_CFLAGS="${GL_CFLAGS} ${GLES2_CFLAGS}"
GL_LIBS="${GL_LIBS} ${GLES2_LIBS}"], GL_LIBS="${GL_LIBS} ${GLES2_LIBS}"],
[:]) [:])

PKG_CHECK_MODULES(GL, gl,
[ac_cv_my_have_gl="yes"
AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available)],
[:])

AC_CHECK_LIB(GL, glLoadIdentity, AC_CHECK_LIB(GL, glLoadIdentity,
[ac_cv_my_have_gl="yes" [ac_cv_my_have_gl="yes"
AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available) # FIXME: hackish AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available) # FIXME: hackish


+ 3
- 3
src/debug/quad.cpp View File

@@ -1082,13 +1082,13 @@ void DebugQuad::ResetState()
#if defined HAVE_GLBEGIN || defined USE_GLEW || defined __CELLOS_LV2__ #if defined HAVE_GLBEGIN || defined USE_GLEW || defined __CELLOS_LV2__
glClientActiveTexture(GL_TEXTURE0); glClientActiveTexture(GL_TEXTURE0);
#endif #endif
#if !defined __CELLOS_LV2__ && !defined __ANDROID__
#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE); glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE);
#endif #endif
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);


glDisable(GL_BLEND); glDisable(GL_BLEND);
#if !defined __CELLOS_LV2__ && !defined __ANDROID__
#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
glDisable(GL_POINT_SPRITE); glDisable(GL_POINT_SPRITE);
#endif #endif


@@ -1100,7 +1100,7 @@ void DebugQuad::ResetState()
cgGLDisableProfile(cgGLGetLatestProfile(CG_GL_FRAGMENT)); cgGLDisableProfile(cgGLGetLatestProfile(CG_GL_FRAGMENT));
#endif #endif


#if !defined __CELLOS_LV2__ && !defined __ANDROID__
#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
glDisable(GL_VERTEX_PROGRAM_POINT_SIZE); glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
#endif #endif
} }


Loading…
Cancel
Save