Changeset 673Tweet

Timestamp:

Feb 20, 2011, 1:03:07 PM (11 years ago)

Author:

sam

Message:

Put the OpenGL header handling in <lolgl.h> for more convenience.

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/debugsphere.cpp (modified) (2 diffs)
• src/lolgl.h (added)
• src/scene.cpp (modified) (1 diff)
• src/shader.cpp (modified) (1 diff)
• src/tileset.cpp (modified) (2 diffs)
• src/video.cpp (modified) (1 diff)
• win32/deushax.vcxproj (modified) (1 diff)
• win32/deushax.vcxproj.filters (modified) (1 diff)
• win32/editor.vcxproj (modified) (1 diff)
• win32/editor.vcxproj.filters (modified) (1 diff)
• win32/monsterz.vcxproj (modified) (1 diff)
• win32/monsterz.vcxproj.filters (modified) (1 diff)

trunk/configure.ac

@@ -77 +77 @@
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
 
+# Which version of OpenGL to use?
+ac_cv_my_have_gl="no"
+PKG_CHECK_MODULES(GLES1, glesv1_cm,
+ [ac_cv_my_have_gl="yes"
+  AC_DEFINE(HAVE_GLES_1X, 1, Define to 1 if GLES 1.x is available)
+  GL_CFLAGS="${GLES1_CFLAGS}"
+  GL_LIBS="${GLES1_LIBS}"],
+ [:])
+PKG_CHECK_MODULES(GLES2, glesv2,
+ [ac_cv_my_have_gl="yes"
+  AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available)
+  GL_CFLAGS="${GLES2_CFLAGS}"
+  GL_LIBS="${GLES2_LIBS}"],
+ [:])
+AC_CHECK_LIB(GL, glLoadIdentity,
+ [ac_cv_my_have_gl="yes"
+  AC_DEFINE(HAVE_GL_1X, 1, Define to 1 if GL 1.x is available)
+  GL_LIBS="-lGL"]) # FIXME: hackish
+if test "${ac_cv_my_have_gl}" = "no"; then
+  AC_MSG_ERROR([[No OpenGL or OpenGL ES implementation found]])
+fi
+
 # Use SDL? (always required)
 ac_cv_my_have_sdl="yes"
@@ -84 +106 @@
   SDL_LIBS="${SDL_LIBS} `sdl-config --libs`"
 fi
+SDL_CFLAGS="${SDL_CFLAGS} ${GL_CFLAGS}"
+SDL_LIBS="${SDL_LIBS} ${GL_LIBS}"
 PKG_CHECK_MODULES(SDL, sdl, [:],
  [SDL_LIBS="${SDL_LIBS} -lSDL"])
-AC_CHECK_LIB(GL, glLoadIdentity, SDL_LIBS="${SDL_LIBS} -lGL") # FIXME: hackish
 PKG_CHECK_MODULES(SDLMIXER, SDL_mixer, [:],
  [SDLMIXER_LIBS="${SDLMIXER_LIBS} -lSDL_mixer"])
 PKG_CHECK_MODULES(SDLIMAGE, SDL_image, [:],
  [SDLIMAGE_LIBS="${SDLIMAGE_LIBS} -lSDL_image"])
-save_CPPFLAGS="${CPPFLAGS}"
 SDL_CFLAGS="${SDL_CFLAGS} ${SDLMIXER_CFLAGS} ${SDLIMAGE_CFLAGS}"
 SDL_LIBS="${SDL_LIBS} ${SDLMIXER_LIBS} ${SDLIMAGE_LIBS}"
 
+save_CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
 AC_CHECK_HEADERS(SDL_mixer.h, [:], [ac_cv_my_have_sdl="no"])

trunk/src/Makefile.am

@@ -5 +5 @@
     core.h matrix.cpp matrix.h tiler.cpp tiler.h dict.cpp dict.h \
     audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \
-    map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h \
+    map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
     tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h \
     timer.cpp timer.h bitfield.h profiler.cpp profiler.h input.h input.cpp \

trunk/src/debugsphere.cpp

@@ -18 +18 @@
 #   include <windows.h>
 #endif
-#if defined __APPLE__ && defined __MACH__
-#   include <OpenGL/gl.h>
-#else
-#   define GL_GLEXT_PROTOTYPES
-#   include <GL/gl.h>
-#endif
 
 #include <cstdio>
@@ -29 +23 @@
 
 #include "core.h"
+#include "lolgl.h"
 #include "debugsphere.h"
 

trunk/src/scene.cpp

@@ -21 +21 @@
 #   include <windows.h>
 #endif
-#if defined __APPLE__ && defined __MACH__
-#   include <OpenGL/gl.h>
-#else
-#   define GL_GLEXT_PROTOTYPES
-#   include <GL/gl.h>
-#endif
 
 #include "core.h"
+#include "lolgl.h"
 
 struct Tile

trunk/src/shader.cpp

@@ -20 +20 @@
 #   include <windows.h>
 #endif
-#if defined __APPLE__ && defined __MACH__
-#   include <OpenGL/gl.h>
-#else
-#   define GL_GLEXT_PROTOTYPES
-#   include <GL/gl.h>
-#endif
 
 #include "core.h"
+#include "lolgl.h"
 
 /*

trunk/src/tileset.cpp

@@ -20 +20 @@
 #   include <windows.h>
 #endif
-#if defined __APPLE__ && defined __MACH__
-#   include <OpenGL/gl.h>
-#else
-#   define GL_GLEXT_PROTOTYPES
-#   include <GL/gl.h>
-#endif
 
 #include <SDL.h>
@@ -31 +25 @@
 
 #include "core.h"
+#include "lolgl.h"
 
 /*

trunk/src/video.cpp

@@ -20 +20 @@
 #   include <windows.h>
 #endif
-#if defined __APPLE__ && defined __MACH__
-#   include <OpenGL/gl.h>
-#else
-#   define GL_GLEXT_PROTOTYPES
-#   include <GL/gl.h>
-#endif
 
 #include "core.h"
+#include "lolgl.h"
 
 #if LOL_EXPERIMENTAL

trunk/win32/deushax.vcxproj

@@ -29 +29 @@
     <ClInclude Include="..\src\input.h" />
     <ClInclude Include="..\src\layer.h" />
+    <ClInclude Include="..\src\lolgl.h" />
     <ClInclude Include="..\src\map.h" />
     <ClInclude Include="..\src\matrix.h" />

trunk/win32/deushax.vcxproj.filters

@@ -49 +49 @@
       <Filter>lolengine</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lolgl.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\map.h">
       <Filter>lolengine</Filter>

trunk/win32/editor.vcxproj

@@ -29 +29 @@
     <ClInclude Include="..\src\input.h" />
     <ClInclude Include="..\src\layer.h" />
+    <ClInclude Include="..\src\lolgl.h" />
     <ClInclude Include="..\src\map.h" />
     <ClInclude Include="..\src\matrix.h" />

trunk/win32/editor.vcxproj.filters

@@ -49 +49 @@
       <Filter>lolengine</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lolgl.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\map.h">
       <Filter>lolengine</Filter>

trunk/win32/monsterz.vcxproj

@@ -34 +34 @@
     <ClInclude Include="..\src\input.h" />
     <ClInclude Include="..\src\layer.h" />
+    <ClInclude Include="..\src\lolgl.h" />
     <ClInclude Include="..\src\map.h" />
     <ClInclude Include="..\src\matrix.h" />

trunk/win32/monsterz.vcxproj.filters

@@ -49 +49 @@
       <Filter>lolengine</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lolgl.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\map.h">
       <Filter>lolengine</Filter>