diff options
| author | Stijn Buys <ingar@osirion.org> | 2011-02-17 13:09:51 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2011-02-17 13:09:51 +0000 |
| commit | 0c5a4394c4b0382e96fdde6c11ab908f63a4c973 (patch) | |
| tree | 6ca779689e7e13e70f9a38444db9a1556273fbba | |
| parent | e082e5055ec81fcec9e38e41baae488f59aabbfb (diff) | |
Removed SDL exception for MacOS from configure,
removed extern "C" from OpenGL function pointers.
| -rw-r--r-- | configure.in | 53 | ||||
| -rw-r--r-- | src/render/gl.h | 4 |
2 files changed, 20 insertions, 37 deletions
diff --git a/configure.in b/configure.in index d9f577d..f30d818 100644 --- a/configure.in +++ b/configure.in @@ -81,7 +81,6 @@ case "$host" in HOST_LIBS="" HOST_GL_LIBS="-framework OpenGL" HOST_AL_LIBS="-framework OpenAL" - HOST_SDL_LIBS="-framework SDL -framework Cocoa" ICON_CLIENT="" ICON_SERVER="" SDLMAIN="SDLMain.o" @@ -415,43 +414,31 @@ else dnl SDL dnl - if test "x${OS}" = "xOSX"; then - AC_CHECK_HEADER(SDL/SDL.h, - [], - [AC_MSG_ERROR([SDL/SDL.h not found])] - ) - - LIBSDL_LIBS="$HOST_SDL_LIBS" - LIBSDL_CFLAGS="$HOST_SDL_LIBS" - AC_SUBST(LIBSDL_LIBS) - AC_SUBST(LIBSDL_CFLAGS) - else - AC_MSG_CHECKING([looking for SDL]) - KDE_FIND_PATH(sdl-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ + AC_MSG_CHECKING([looking for SDL]) + KDE_FIND_PATH(sdl-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ AC_MSG_ERROR([SDL not found]) - ]) + ]) - if test -n "$LIBSDL_CONFIG"; then - LIBSDL_LIBS="`$LIBSDL_CONFIG --libs`" - LIBSDL_RPATH= - for args in $LIBSDL_LIBS; do - case $args in - -L*) - LIBSDL_RPATH="$LIBSDL_RPATH $args" - ;; - esac - done + if test -n "$LIBSDL_CONFIG"; then + LIBSDL_LIBS="`$LIBSDL_CONFIG --libs`" + LIBSDL_RPATH= + for args in $LIBSDL_LIBS; do + case $args in + -L*) + LIBSDL_RPATH="$LIBSDL_RPATH $args" + ;; + esac + done - LIBSDL_RPATH=`echo $LIBSDL_RPATH | sed -e "s/-L/-R/g"` - LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`" - fi + LIBSDL_RPATH=`echo $LIBSDL_RPATH | sed -e "s/-L/-R/g"` + LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`" + fi - AC_MSG_RESULT($HAVE_LIBSDL) + AC_MSG_RESULT($HAVE_LIBSDL) - AC_SUBST(LIBSDL_LIBS) - AC_SUBST(LIBSDL_CFLAGS) - AC_SUBST(LIBSDL_RPATH) - fi + AC_SUBST(LIBSDL_LIBS) + AC_SUBST(LIBSDL_CFLAGS) + AC_SUBST(LIBSDL_RPATH) BUILD_CLIENT=yes AC_DEFINE_UNQUOTED(BUILD_CLIENT, 1, [Define this to build the client]) diff --git a/src/render/gl.h b/src/render/gl.h index 51e215c..7270f2d 100644 --- a/src/render/gl.h +++ b/src/render/gl.h @@ -251,8 +251,6 @@ typedef void (* APIENTRY deletebuffers_func)(GLuint count, GLuint *id); typedef void (* APIENTRY bindbuffer_func)(GLenum target, GLuint id); typedef void (* APIENTRY bufferdata_func)(GLenum target, GLsizei size, const GLvoid *data, GLenum usage); -extern "C" { - extern genbuffers_func genbuffers; extern deletebuffers_func deletebuffers; extern bindbuffer_func bindbuffer; @@ -260,6 +258,4 @@ extern bufferdata_func bufferdata; } -} - #endif // __INCLUDED_RENDER_GL_H__ |