diff --git a/src/input/input.cpp b/src/input/input.cpp index db77a61e..51776373 100644 --- a/src/input/input.cpp +++ b/src/input/input.cpp @@ -14,10 +14,12 @@ #include -#if defined HAVE_SDL_SDL_H -# include -#else -# include +#if defined USE_SDL +# if defined HAVE_SDL_SDL_H +# include +# else +# include +# endif #endif #include "core.h" diff --git a/src/platform/sdl/sdlinput.cpp b/src/platform/sdl/sdlinput.cpp index c13c8072..32488123 100644 --- a/src/platform/sdl/sdlinput.cpp +++ b/src/platform/sdl/sdlinput.cpp @@ -12,10 +12,12 @@ # include "config.h" #endif -#if defined HAVE_SDL_SDL_H -# include -#else -# include +#if defined USE_SDL +# if defined HAVE_SDL_SDL_H +# include +# else +# include +# endif #endif #include "core.h" diff --git a/tutorial/05_easymesh.cpp b/tutorial/05_easymesh.cpp index 8ba4e306..160dc7c0 100644 --- a/tutorial/05_easymesh.cpp +++ b/tutorial/05_easymesh.cpp @@ -24,7 +24,8 @@ public: { m_angle = 0; 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), vec3(0.f, 0.f, 0.f),