From db2626136bd35e974a24c64b1b50c4187de30bdf Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 4 Mar 2014 21:18:41 +0100 Subject: [PATCH] [DEV] cmake file update --- CMakeLists.txt | 13 +++++++++++++ draw/Color.cpp | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c433e9..6668d24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,19 @@ set(src_files include_directories(${etk_SOURCE_DIR}) include_directories(${linearmath_SOURCE_DIR}/bullet/src/) + +add_definitions( -DDEBUG_LEVEL=3 ) +add_definitions( -DDEBUG=1 ) +if (APPLE) + add_definitions( -D__TARGET_OS__MacOs ) +elseif (UNIX) + add_definitions( -D__TARGET_OS__Linux ) +elseif (WIN32) + add_definitions( -D__TARGET_OS__Windows ) +endif () + + + #Create a static Lib: add_library(agg STATIC ${src_files} ) include_directories(${freetype_SOURCE_DIR}) diff --git a/draw/Color.cpp b/draw/Color.cpp index 3f267ce..2c45397 100644 --- a/draw/Color.cpp +++ b/draw/Color.cpp @@ -370,8 +370,6 @@ void draw::parseColor(const char* _input, struct agg::rgba8& color) return; } const char* inputData = _input; - uint32_t _red, _green, _blue, _alpha; - float fred, fgreen, fblue, falpha; size_t len = strlen(_input); if( len >=1