From 22733ef3a84912cbbdb5a24a8ea38ff83c1ec7e4 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 15 Feb 2012 21:11:21 -0500 Subject: [PATCH] Fixed bug 1419 - SDL_libgl2D.c breaks ndk-build Philip Taylor 2012-02-15 10:43:47 PST render/nds/SDL_libgl2D.c unconditionally includes NDS-only code. SDL's Android.mk compiles source files matching $(wildcard $(LOCAL_PATH)/src/render/*/*.c) which includes that file, causing build errors when running ndk-build. --- src/render/nds/SDL_libgl2D.c | 5 +++++ src/render/nds/SDL_libgl2D.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/render/nds/SDL_libgl2D.c b/src/render/nds/SDL_libgl2D.c index aaca4ce3b..7ba9be072 100644 --- a/src/render/nds/SDL_libgl2D.c +++ b/src/render/nds/SDL_libgl2D.c @@ -13,6 +13,9 @@ * * A very small and simple DS rendering lib using the 3d core to render 2D stuff */ +#include "SDL_config.h" + +#if SDL_VIDEO_RENDER_NDS #include "SDL_libgl2D.h" @@ -308,3 +311,5 @@ void glSpriteScaleXY(int x, int y, s32 scaleX, s32 scaleY, int flipmode, const g glPopMatrix(1); g_depth++; } + +#endif /* SDL_VIDEO_RENDER_NDS */ diff --git a/src/render/nds/SDL_libgl2D.h b/src/render/nds/SDL_libgl2D.h index 97bbebb0e..4d56f0e89 100644 --- a/src/render/nds/SDL_libgl2D.h +++ b/src/render/nds/SDL_libgl2D.h @@ -13,6 +13,9 @@ * * A very small and simple DS rendering lib using the 3d core to render 2D stuff */ +#include "SDL_config.h" + +#if SDL_VIDEO_RENDER_NDS #include @@ -148,3 +151,4 @@ void glBox(int x1, int y1, int x2, int y2, int color); */ void glBoxFilled(int x1, int y1, int x2, int y2, int color); +#endif /* SDL_VIDEO_RENDER_NDS */