Changeset 2301


Ignore:
Timestamp:
Jan 31, 2013, 8:35:14 AM (6 years ago)
Author:
sam
Message:

build: fix a few macro logic issues in SDL.h inclusion.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/autotools/m4/lol-sdl.m4

    r2300 r2301  
    1010dnl    USE_SDL_IMAGE   -- whether SDL_image was found
    1111dnl    USE_SDL_MIXER   -- whether SDL_mixer was found
    12 dnl    HAVE_SDL2_SDL_H -- whether to include <SDL2/SDL.h>
    1312dnl    HAVE_SDL_SDL_H  -- whether to include <SDL/SDL.h>
    1413dnl    HAVE_SDL_H      -- whether to include <SDL.h>
    1514dnl  Generated automake conditionals:
    16 dnl    USE_SDL         -- whether SDL or SDL2 were found at all (conditional)
    17 dnl    USE_SDL_IMAGE   -- whether SDL_image was found (conditional)
    18 dnl    USE_SDL_MIXER   -- whether SDL_mixer was found (conditional)
     15dnl    USE_SDL         -- whether SDL or SDL2 were found at all
     16dnl    USE_SDL_IMAGE   -- whether SDL_image was found
     17dnl    USE_SDL_MIXER   -- whether SDL_mixer was found
    1918dnl  Generated shell variables:
    2019dnl    SDL_CFLAGS      -- flags for SDL compilation
  • trunk/src/application/application.cpp

    r2300 r2301  
    5555    /* FIXME: this macro is only deactivated if we include "lolgl.h" */
    5656    EglApp app;
    57 #elif defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
     57#elif defined USE_SDL
    5858    SdlApp app;
    5959#else
  • trunk/src/eglapp.cpp

    r2300 r2301  
    2626
    2727#if defined USE_SDL
    28 #   if defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
     28#   if defined HAVE_SDL_SDL_H
    2929#      include <SDL/SDL.h>
    3030#   else
  • trunk/src/platform/sdl/sdlapp.cpp

    r2300 r2301  
    1414
    1515#if defined USE_SDL
    16 #   if defined HAVE_SDL2_SDL_H
    17 #      include <SDL2/SDL.h>
    18 #   elif defined HAVE_SDL_SDL_H
     16#   if defined HAVE_SDL_SDL_H
    1917#      include <SDL/SDL.h>
    2018#   else
  • trunk/src/sys/timer.cpp

    r2300 r2301  
    3131#   include <sys/timer.h>
    3232#   include <sys/time_util.h>
    33 #elif defined HAVE_SDL_H || defined HAVE_SDL_SDL_H
     33#elif defined HAVE_SDL_SDL_H
    3434#   include <SDL/SDL.h>
    3535#else
Note: See TracChangeset for help on using the changeset viewer.