luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GB.SDL]

Browse Source 
* BUG: Use pkg-config to properly detect dependencies.



git-svn-id: svn://localhost/gambas/trunk@3892 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Laurent Carlier 2011-06-18 14:55:14 +00:00
parent ced3c8066d
commit 75cbb9774e
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gb.sdl/configure.ac
View File

@ -8,26 +8,33 @@ AC_PROG_LIBTOOL
GB_CHECK_XWINDOW GB_CHECK_XWINDOW
dnl TODO: add a version test in GB_COMPONENT! dnl TODO: add a version test in GB_COMPONENT!
GB_PATH_SDL([1.2.8], [], [touch DISABLED]) dnl GB_PATH_SDL([1.2.8], [], [touch DISABLED])
dnl check Xcursor support dnl check Xcursor support
AC_CHECK_LIB(Xcursor, XcursorLibraryLoadCursor, dnl AC_CHECK_LIB(Xcursor, XcursorLibraryLoadCursor,
[echo -n dnl [echo -n
LDFLAGS="$LDFLAGS -lXcursor"], dnl LDFLAGS="$LDFLAGS -lXcursor"],
[AC_MSG_WARN([libXcursor not found. Check 'config.log' for more details.]) dnl [AC_MSG_WARN([libXcursor not found. Check 'config.log' for more details.])
touch DISABLED], dnl touch DISABLED],
$X_LIBS) dnl $X_LIBS)
dnl check for SDL libs dnl check for SDL libs
GB_COMPONENT( dnl GB_COMPONENT(
sdl, dnl sdl,
SDL, dnl SDL,
[SDL], dnl [SDL],
[src], dnl [src],
[GB_FIND(SDL_opengl.h SDL.h SDL_ttf.h, `sdl-config --prefix`, include/SDL)], dnl [GB_FIND(SDL_opengl.h SDL.h SDL_ttf.h, `sdl-config --prefix`, include/SDL)],
[GB_FIND(libSDL_ttf.$SHLIBEXT libGLEW.$SHLIBEXT, /usr /usr/X11R6 /usr/local `sdl-config --prefix`, lib)], dnl [GB_FIND(libSDL_ttf.$SHLIBEXT libGLEW.$SHLIBEXT, /usr /usr/X11R6 /usr/local `sdl-config --prefix`, lib)],
[$X_LIBS -lSDL_ttf -lGLEW], dnl [$X_LIBS -lSDL_ttf -lGLEW],
[$SDL_CFLAGS]) dnl [$SDL_CFLAGS])
GB_COMPONENT_PKG_CONFIG(
sdl,
SDL,
[SDL],
[src],
sdl "> 1.2.8" SDL_ttf glew xcursor)
AC_OUTPUT( \ AC_OUTPUT( \
Makefile \ Makefile \

6
gb.sdl/src/SDL_h.h
View File

@ -24,9 +24,9 @@
#ifndef __SDL_H_H #ifndef __SDL_H_H
#define __SDL_H_H #define __SDL_H_H
#include <GL/glew.h> #include <glew.h>
#include "SDL.h" #include <SDL.h>
#include "SDL_syswm.h" #include <SDL_syswm.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include "SDLapp.h" #include "SDLapp.h"