atria-soft/esvg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] cmake file update

Browse Source
This commit is contained in:
Edouard DUPIN 2014-03-04 21:18:41 +01:00
parent eceec1d928
commit 9229886513
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -28,23 +28,45 @@ include_directories(.)
#Create src file list #Create src file list
set(src_files set(src_files
esvg/Base.cpp esvg/Base.cpp
esvg/Base.h
esvg/Circle.cpp esvg/Circle.cpp
esvg/Circle.h
esvg/debug.cpp esvg/debug.cpp
esvg/debug.h
esvg/Ellipse.cpp esvg/Ellipse.cpp
esvg/Ellipse.h
esvg/Group.cpp esvg/Group.cpp
esvg/Group.h
esvg/Line.cpp esvg/Line.cpp
esvg/Line.h
esvg/esvg.cpp esvg/esvg.cpp
esvg/esvg.h
esvg/Path.cpp esvg/Path.cpp
esvg/Path.h
esvg/Polygon.cpp esvg/Polygon.cpp
esvg/Polygon.h
esvg/Polyline.cpp esvg/Polyline.cpp
esvg/Polyline.h
esvg/Rectangle.cpp esvg/Rectangle.cpp
esvg/Rectangle.h
esvg/Renderer.cpp esvg/Renderer.cpp
esvg/Renderer.h
esvg/Stroking.cpp esvg/Stroking.cpp
esvg/Stroking.h
esvg/Text.cpp esvg/Text.cpp
esvg/Text.h
) )
add_definitions( -DDEBUG_LEVEL=3 ) add_definitions( -DDEBUG_LEVEL=3 )
add_definitions( -DDEBUG=1 ) 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 ()
include_directories(${etk_SOURCE_DIR}) include_directories(${etk_SOURCE_DIR})
include_directories(${linearmath_SOURCE_DIR}/bullet/src/) include_directories(${linearmath_SOURCE_DIR}/bullet/src/)

4
esvg/Base.cpp
View File

@ -166,10 +166,6 @@ int32_t extractPartOfStyle(const std::string& _data, std::string& _outputType, s
if (_pos == -1) { if (_pos == -1) {
return -2; return -2;
} }
int32_t typeStart = _pos;
int32_t typeStop = _pos;
int32_t dataStart = _pos;
int32_t dataStop = _pos;
bool processFirst=true; bool processFirst=true;
//SVG_DEBUG("parse : '" << _data.Extract(_pos) << "'"); //SVG_DEBUG("parse : '" << _data.Extract(_pos) << "'");
for( int32_t iii=_pos; iii<_data.size(); iii++) { for( int32_t iii=_pos; iii<_data.size(); iii++) {

4
esvg/Polygon.h
View File

@ -13,14 +13,16 @@
#include <vector> #include <vector>
namespace esvg { namespace esvg {
/*
enum polygonMode { enum polygonMode {
polygoneModeNonZero, polygoneModeNonZero,
polygoneModeEvenOdd polygoneModeEvenOdd
}; };
*/
class Polygon : public esvg::Base { class Polygon : public esvg::Base {
private: private:
std::vector<etk::Vector2D<float> > m_listPoint; //!< list of all point of the polygone std::vector<etk::Vector2D<float> > m_listPoint; //!< list of all point of the polygone
enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode //enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode
public: public:
Polygon(PaintState parentPaintState); Polygon(PaintState parentPaintState);
~Polygon(void); ~Polygon(void);