From 1285ae4a612b238db2656b43b43a99f0a6f5b726 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Wed, 8 Apr 2015 20:23:27 +0200
Subject: [PATCH] Add ColorConv.cpp/h to a bunch of project files

---
 CMakeLists.txt         | 2 ++
 Qt/Common.pro          | 1 +
 android/jni/Android.mk | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9aeda8fcc1..82d2c02e37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,6 +336,8 @@ endif()
 
 add_library(Common STATIC
 	${CommonExtra}
+	Common/ColorConv.cpp
+	Common/ColorConv.h
 	Common/ChunkFile.cpp
 	Common/ChunkFile.h
 	Common/ConsoleListener.cpp
diff --git a/Qt/Common.pro b/Qt/Common.pro
index 285fd72ca6..871c3cbaa3 100644
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@@ -44,6 +44,7 @@ win32 {
 }
 
 SOURCES += $$P/Common/ChunkFile.cpp \
+	$$P/Common/ColorConv.cpp \
 	$$P/Common/ConsoleListener.cpp \
 	$$P/Common/FileUtil.cpp \
 	$$P/Common/LogManager.cpp \
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 0695fdf5eb..c7abba62a5 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -154,6 +154,7 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/Crypto/sha1.cpp \
   $(SRC)/Common/Crypto/sha256.cpp \
   $(SRC)/Common/ChunkFile.cpp \
+  $(SRC)/Common/ColorConv.cpp \
   $(SRC)/Common/KeyMap.cpp \
   $(SRC)/Common/LogManager.cpp \
   $(SRC)/Common/MemArena.cpp \