Browse Source

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

legacy
Sam Hocevar sam 12 years ago
parent
commit
7a776e72f5
3 changed files with 14 additions and 9 deletions
  1. +6
    -4
      src/input/input.cpp
  2. +6
    -4
      src/platform/sdl/sdlinput.cpp
  3. +2
    -1
      tutorial/05_easymesh.cpp

+ 6
- 4
src/input/input.cpp View File

@@ -14,10 +14,12 @@


#include <cstdlib> #include <cstdlib>


#if defined HAVE_SDL_SDL_H
# include <SDL/SDL.h>
#else
# include <SDL.h>
#if defined USE_SDL
# if defined HAVE_SDL_SDL_H
# include <SDL/SDL.h>
# else
# include <SDL.h>
# endif
#endif #endif


#include "core.h" #include "core.h"


+ 6
- 4
src/platform/sdl/sdlinput.cpp View File

@@ -12,10 +12,12 @@
# include "config.h" # include "config.h"
#endif #endif


#if defined HAVE_SDL_SDL_H
# include <SDL/SDL.h>
#else
# include <SDL.h>
#if defined USE_SDL
# if defined HAVE_SDL_SDL_H
# include <SDL/SDL.h>
# else
# include <SDL.h>
# endif
#endif #endif


#include "core.h" #include "core.h"


+ 2
- 1
tutorial/05_easymesh.cpp View File

@@ -24,7 +24,8 @@ public:
{ {
m_angle = 0; m_angle = 0;
m_mesh.Compile("sc#e94 scb#964 [acap11 6 6 tx8]"); m_mesh.Compile("sc#e94 scb#964 [acap11 6 6 tx8]");
m_mesh.Compile("sc#94e scb#649 [acap3 6 6 tx-8]");
m_mesh.Compile("sc#94e scb#649 [acap3 6 6 tx-5 tz-6]");
m_mesh.Compile("sc#49e scb#469 [acap31 6 6 tx-5 tz6]");


m_camera = new Camera(vec3(0.f, 600.f, 0.f), m_camera = new Camera(vec3(0.f, 600.f, 0.f),
vec3(0.f, 0.f, 0.f), vec3(0.f, 0.f, 0.f),


Loading…
Cancel
Save