From ee150fadbb2fb60d25854f9e46dbead509675b97 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 30 Mar 2014 01:11:15 +0100 Subject: [PATCH] Update CMake and Android build --- CMakeLists.txt | 2 ++ GPU/GLES/DepalettizeShader.cpp | 2 -- android/jni/Android.mk | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3685a05fd..f68da258c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1243,6 +1243,8 @@ add_library(GPU OBJECT GPU/Debugger/Breakpoints.h GPU/Debugger/Stepping.cpp GPU/Debugger/Stepping.h + GPU/GLES/DepalettizeShader.cpp + GPU/GLES/DepalettizeShader.h GPU/GLES/GLES_GPU.cpp GPU/GLES/GLES_GPU.h GPU/GLES/FragmentShaderGenerator.cpp diff --git a/GPU/GLES/DepalettizeShader.cpp b/GPU/GLES/DepalettizeShader.cpp index 6b9499830b..9a4620fa6c 100644 --- a/GPU/GLES/DepalettizeShader.cpp +++ b/GPU/GLES/DepalettizeShader.cpp @@ -17,8 +17,6 @@ #include -#define SHADERLOG - #include "base/logging.h" #include "Common/Log.h" #include "DepalettizeShader.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 711e9368fe..8bd8a9abaa 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -144,6 +144,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/GPU/Debugger/Breakpoints.cpp \ $(SRC)/GPU/Debugger/Stepping.cpp \ $(SRC)/GPU/GLES/Framebuffer.cpp \ + $(SRC)/GPU/GLES/DepalettizeShader.cpp \ $(SRC)/GPU/GLES/GLES_GPU.cpp.arm \ $(SRC)/GPU/GLES/TextureCache.cpp.arm \ $(SRC)/GPU/GLES/TransformPipeline.cpp.arm \