Changeset 1692


Ignore:
Timestamp:
Aug 3, 2012, 2:15:54 PM (7 years ago)
Author:
sam
Message:

core: fix the X360 build by re-adding macro barriers I removed.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/input/input.cpp

    r1691 r1692  
    1515#include <cstdlib>
    1616
    17 #if defined HAVE_SDL_SDL_H
    18 #   include <SDL/SDL.h>
    19 #else
    20 #   include <SDL.h>
     17#if defined USE_SDL
     18#   if defined HAVE_SDL_SDL_H
     19#      include <SDL/SDL.h>
     20#   else
     21#      include <SDL.h>
     22#   endif
    2123#endif
    2224
  • trunk/src/platform/sdl/sdlinput.cpp

    r1691 r1692  
    1313#endif
    1414
    15 #if defined HAVE_SDL_SDL_H
    16 #   include <SDL/SDL.h>
    17 #else
    18 #   include <SDL.h>
     15#if defined USE_SDL
     16#   if defined HAVE_SDL_SDL_H
     17#      include <SDL/SDL.h>
     18#   else
     19#      include <SDL.h>
     20#   endif
    1921#endif
    2022
  • trunk/tutorial/05_easymesh.cpp

    r1647 r1692  
    2525        m_angle = 0;
    2626        m_mesh.Compile("sc#e94 scb#964 [acap11 6 6 tx8]");
    27         m_mesh.Compile("sc#94e scb#649 [acap3 6 6 tx-8]");
     27        m_mesh.Compile("sc#94e scb#649 [acap3 6 6 tx-5 tz-6]");
     28        m_mesh.Compile("sc#49e scb#469 [acap31 6 6 tx-5 tz6]");
    2829
    2930        m_camera = new Camera(vec3(0.f, 600.f, 0.f),
Note: See TracChangeset for help on using the changeset viewer.