# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401717 -7200 # Node ID 134a83fd6d82f2b87f41b5e79d2f2d6d48565375 # Parent 2013ebce6d92d02bd31c196a70cc755eadb5373f Revision: 201007 Kit: 201008 diff -r 2013ebce6d92 -r 134a83fd6d82 gfxtools/gditools/group/bld.inf --- a/gfxtools/gditools/group/bld.inf Fri Feb 19 23:50:22 2010 +0200 +++ b/gfxtools/gditools/group/bld.inf Fri Mar 12 15:48:37 2010 +0200 @@ -32,10 +32,6 @@ ../group/fontcomp.ipr /epoc32/engdoc/tools/fontcomp.ipr -// IBY-files -../rom/gdi.iby CORE_IBY_EXPORT_PATH(tools,gdi.iby) - - PRJ_MMPFILES #if (defined TOOLS ) || (defined TOOLS2) diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe Binary file svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe has changed diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/group/SVGEncoder_CPP.sln --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svgtencoder/svgtenc/standalone/group/SVGEncoder_CPP.sln Fri Mar 12 15:48:37 2010 +0200 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SVGEncoder_CPP", "SVGEncoder_CPP.vcproj", "{1D186CAE-9861-489C-92AF-FA33ACCFDB58}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1D186CAE-9861-489C-92AF-FA33ACCFDB58}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D186CAE-9861-489C-92AF-FA33ACCFDB58}.Debug|Win32.Build.0 = Debug|Win32 + {1D186CAE-9861-489C-92AF-FA33ACCFDB58}.Release|Win32.ActiveCfg = Release|Win32 + {1D186CAE-9861-489C-92AF-FA33ACCFDB58}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/group/SVGEncoder_CPP.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svgtencoder/svgtenc/standalone/group/SVGEncoder_CPP.vcproj Fri Mar 12 15:48:37 2010 +0200 @@ -0,0 +1,2962 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/group/bld.inf --- a/svgtencoder/svgtenc/standalone/group/bld.inf Fri Feb 19 23:50:22 2010 +0200 +++ b/svgtencoder/svgtenc/standalone/group/bld.inf Fri Mar 12 15:48:37 2010 +0200 @@ -1,32 +1,56 @@ -/* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ +#include + +PRJ_PLATFORMS +//#ifdef SBSV2 + TOOLS2 +//#else + TOOLS +//#endif + +PRJ_EXPORTS + +//#ifndef SBSV2 + //START TOOLS + //#if defined(TOOLS) + ../binary/svgtbinencode.exe /epoc32/tools/svgtbinencode.exe + // For Windows abld Support "Link with dynamic xerces-c.2.8.0" + //../lib_win/xerces-c_2.lib /epoc32/release/tools/rel/xerces-c_2.lib + //../lib_win/xerces-c_2.lib /epoc32/release/tools/deb/xerces-c_2.lib + //#endif + //END +//#endif + +#if HOSTPLATFORM_DIR==win32 + #if defined(SBSV2) && defined(TOOLS2) + // For Windows Raptor Support "Link with static xerces-c.2.8.0 mingw" + ../lib_win/libxercesenc-c.a ../release/tools2/rel/libxercesenc-c.a + ../lib_win/libxercesenc-c.a ../release/tools2/deb/libxercesenc-c.a + #endif +#endif + +#if HOSTPLATFORM_DIR!=win32 + #if defined(SBSV2) && defined(TOOLS2) + // For Linux Raptor Support "Link with static xerces-c.2.8.0 mingw" + ../lib_linux/libxercesenc-c.a ../release/tools2/linux-i386/rel/libxercesenc-c.a + ../lib_linux/libxercesenc-c.a ../release/tools2/linux-i386/deb/libxercesenc-c.a + #endif +#endif -PRJ_PLATFORMS - -TOOLS - -PRJ_EXPORTS -../lib/SVGTBinEncode.exe /epoc32/tools/SVGTBinEncode.exe -../lib/xerces-c_2_6.dll /epoc32/tools/xerces-c_2_6.dll PRJ_MMPFILES -// Copy the SVGT Encoder Binary to target dir -//gnumakefile copysvgtbinencode.mk +#if defined(SBSV2) && defined(TOOLS2) + + /* + * NOTICE! svgtbinencode is not compiled any more during usual build. + * It is just exported from ../binary directory. + * If you really want compile svgtbinencode from sources you need to + * uncomment below line, build this project using "sbs -c tools2 - b bld.inf" and copy + * /epoc32/tools/svgtbinencode.exe to ../binary directory and + * put the binary to version control. + */ + +// svgtbinencoder.mmp -// Enable Below Extension Makefile to compile and copy encoder to target dir -//gnumakefile makefile +#endif + diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/group/svgtbinencoder.mk --- a/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mk Fri Feb 19 23:50:22 2010 +0200 +++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mk Fri Mar 12 15:48:37 2010 +0200 @@ -2,7 +2,7 @@ # Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available -# under the terms of "Eclipse Public License v1.0" +# under the terms of the License "Eclipse Public License v1.0" # which accompanies this distribution, and is available # at the URL "http://www.eclipse.org/legal/epl-v10.html". # @@ -19,7 +19,7 @@ # EPOCROOT # PROGRAM=SVGTBinEncode.exe -XERCES_DLL=xerces-c_2_6.dll +XERCES_DLL=xerces-c_2_8.dll #SYMDEFCPP_DLL=symdefcppdll.dll PARENT_DIR=\sf\mw\uitools\svgtencoder\svgtenc\standalone\group @@ -167,7 +167,7 @@ OBJECTS_C_REL=$(SOURCES_C:.c=.o) -STLPORT_INC=C:\PROGRA~1\MICROS~3\VC98\Include\stlport +#STLPORT_INC=C:\PROGRA~1\MICROS~3\VC98\Include\stlport INCLUDES=/I"$(PARENT_DIR)" \ /I"$(PARENT_DIR)\inc" \ @@ -177,7 +177,7 @@ VPATH=$(PARENT_DIR) CC=cl.exe LINK=link.exe -LINK32_FLAGS= ..\lib\xerces-c_2.lib +LINK32_FLAGS= ..\lib_win\xerces-c_2.lib DEFINES = /nologo /MT /GX /I "..\Internal\SVGEngine\inc" /I "..\Internal\Gfx2D\inc" /I "..\Internal\Gfx2D\VGRasterizer\inc" /I "..\Internal\Xmldomimpl\inc" /I "..\Internal\SVGImpl\inc\SVGDOM" /I "..\Internal\SVGImpl\inc" /I "..\Internal\Path\inc" /I "..\Internal\xmlReader\inc" /I "..\Internal\Sax2Print" /I "..\Internal\Nvg\inc" /D ARM /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c CLFLAGS = /Od /nologo /GF /W4 /Fd -GX @@ -216,13 +216,13 @@ # echo $(BUILD_DIR) # echo $(CURDIR) copy /y "$(PARENT_DIR)\$(PROGRAM).dbg" "\epoc32\RELEASE\tools\deb\$(PROGRAM)" - copy /y "\sf\mw\uitools\svgtencoder\svgtenc\standalone\lib\$(XERCES_DLL)" "\epoc32\RELEASE\tools\deb\$(XERCES_DLL)" + copy /y "\sf\mw\uitools\svgtencoder\svgtenc\standalone\lib_win\$(XERCES_DLL)" "\epoc32\RELEASE\tools\deb\$(XERCES_DLL)" REL_install: $(PROGRAM).rel # echo $(PARENT_DIR) # echo $(BUILD_DIR) # echo $(CURDIR) copy /y "$(PARENT_DIR)\$(PROGRAM).rel" "\epoc32\tools\$(PROGRAM)" - copy /y "\sf\mw\uitools\svgtencoder\svgtenc\standalone\lib\$(XERCES_DLL)" "\epoc32\tools\$(XERCES_DLL)" + copy /y "\sf\mw\uitools\svgtencoder\svgtenc\standalone\lib_win\$(XERCES_DLL)" "\epoc32\tools\$(XERCES_DLL)" DEB_CLEAN: # echo $(CURDIR) @chdir $(PARENT_DIR) && erase /f $(OBJECTS_CPP_DEB) 2>>nul diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp Fri Mar 12 15:48:37 2010 +0200 @@ -0,0 +1,189 @@ +#include + +TARGET svgtbinencode.exe +TARGETTYPE exe + +// These options enable exception handling and set the warning level to 3 for command +// line builds. STL code generates too many warnings at level 4, but is clean at +// level 3. Also require RTTI. + +option MSVC /GX /W3 /GR +option GCC -w -DXML_LIBRARY + +SOURCEPATH ../Internal/xmlReader/src +SOURCE MyRXMLReader.cpp + +SOURCEPATH ../Internal/Sax2Print +SOURCE SAX2PrintHandlers.cpp + + +SOURCEPATH ../Internal/SVGEngine/src +SOURCE SVGAttributeVerifier.cpp +SOURCE SVGContentHandler.cpp +SOURCE Svgencoder.cpp +SOURCE SVGEncoderMain.cpp +SOURCE SVGEngineImpl.cpp +SOURCE SVGErrorImpl.cpp +SOURCE SVGEvent.cpp +SOURCE SVGTEncodeInterfaceImpl.cpp + +SOURCEPATH ../Internal/SVGImpl/src +SOURCE SVGAElementImpl.cpp +SOURCE SVGAnimateElementImpl.cpp +SOURCE SVGAnimateMotionElementImpl.cpp +SOURCE SVGAnimateTransformElementImpl.cpp +SOURCE SVGAnimationBase.cpp +SOURCE SVGAnimTimeController.cpp +SOURCE SVGAnimTimingParser.cpp +SOURCE SVGAudioElementImpl.cpp +SOURCE SVGCircleElementImpl.cpp +SOURCE SVGClrCssValueImpl.cpp +SOURCE SVGColor.cpp +SOURCE SVGDiscardElementImpl.cpp +SOURCE SVGDocumentImpl.cpp +SOURCE SVGDOMImplementationImpl.cpp +SOURCE SVGElementImpl.cpp +SOURCE SVGEllipseElementImpl.cpp +SOURCE SVGFitToViewBoxImpl.cpp +SOURCE SVGFloatCssValueImpl.cpp +SOURCE SVGFontElementImpl.cpp +SOURCE SVGFontFaceElementImpl.cpp +SOURCE SVGFontMap.cpp +SOURCE SVGGElementImpl.cpp +SOURCE SVGGlyphElementImpl.cpp +SOURCE SVGGradientElementImpl.cpp +SOURCE SVGImageElementImpl.cpp +SOURCE SVGIntCssValueImpl.cpp +SOURCE SVGLangSpaceImpl.cpp +SOURCE SVGLinearGradientElementImpl.cpp +SOURCE SVGLineElementImpl.cpp +SOURCE SVGMediaAnimationElementImpl.cpp +SOURCE SVGMediaElementBase.cpp +SOURCE SVGMissingGlyphElementImpl.cpp +SOURCE SVGMpathElementImpl.cpp +SOURCE SVGPaintCssValueImpl.cpp +SOURCE SVGPathDataParser.cpp +SOURCE SVGPathElementImpl.cpp +SOURCE SVGPointLexer.cpp +SOURCE SVGPolylineElementImpl.cpp +SOURCE SVGPreserveAspectRatioImpl.cpp +SOURCE SVGRadialGradientElementImpl.cpp +SOURCE SVGRectElementImpl.cpp +SOURCE SVGRelToAbsPath.cpp +SOURCE SVGSchemaData.cpp +SOURCE SVGSetElementImpl.cpp +SOURCE SVGSolidColorElementImpl.cpp +SOURCE SVGStopElementImpl.cpp +SOURCE SVGStrCssValueImpl.cpp +SOURCE SVGStringTokenizer.cpp +SOURCE SVGStyleElementImpl.cpp +SOURCE SVGTestsImpl.cpp +SOURCE SVGTextElementImpl.cpp +SOURCE SVGTransformListImpl.cpp +SOURCE SVGTransformableImpl.cpp +SOURCE SVGUriReferenceImpl.cpp +SOURCE SVGUseElementImpl.cpp +SOURCE SVGVectorCssValueImpl.cpp +SOURCE SvgHkernelementimpl.cpp +SOURCE Svgsvgelementimpl.cpp + +SOURCEPATH ../Internal/Xmldomimpl/src +SOURCE SVGXmlElementImpl.cpp + +SOURCEPATH ../Internal/Gfx2D/src +SOURCE GfxFloatFixPt.cpp +SOURCE Gfxtrignometric.cpp + +SOURCEPATH ../Internal/Gfx2D/src/GfxGeom + +SOURCE GfxAffineTransform.cpp +SOURCE GfxEllipse2D.cpp +SOURCE GfxEllipseIteratorP.cpp +SOURCE GfxFlatteningPathIterator.cpp +SOURCE GfxGeneralPath.cpp +SOURCE GfxGeneralPathIteratorP.cpp +SOURCE GfxLine2D.cpp +SOURCE GfxLineIteratorP.cpp +SOURCE GfxPoint2D.cpp +SOURCE GfxRectangle2D.cpp +SOURCE GfxRectangleIteratorP.cpp +SOURCE GfxRectangularShape.cpp +SOURCE GfxRoundRectangle2D.cpp +SOURCE GfxRoundRectangleIteratorP.cpp + +SOURCEPATH ../Internal/Gfx2D/src/GfxGc +SOURCE GfxColor.cpp +SOURCE GfxGradientPaint.cpp + +SOURCEPATH ../Internal/testingsymdefcppdll +SOURCE Buf.cpp +SOURCE Des16.cpp +SOURCE Des8.cpp +SOURCE Desc16.cpp +SOURCE Desc8.cpp +SOURCE Hbufc16.cpp +SOURCE Hbufc8.cpp +SOURCE Rfile.cpp +SOURCE Rpointerarraybase.cpp +SOURCE Tbufbase16.cpp +SOURCE Tbufbase8.cpp +SOURCE TBufC.cpp +SOURCE Tbufcbase16.cpp +SOURCE Tbufcbase8.cpp +SOURCE Tchar.cpp +SOURCE TInt64.cpp +SOURCE Tkeydesc8array.cpp +SOURCE Tlex.cpp +SOURCE Tptr16.cpp +SOURCE Tptr8.cpp +SOURCE Tptrc16.cpp +SOURCE Tptrc8.cpp +SOURCE Trgb.cpp +SOURCE utf.cpp + +SOURCEPATH ../Internal/Gfx2D/VGRasterizer/src +SOURCE svgapi.c +SOURCE svgmath.c +SOURCE svgpath.c +SOURCE svgsubdivide.c + +SOURCEPATH ../Internal/Nvg/src +SOURCE NVGCircleElement.cpp +SOURCE NvgCommandSection.cpp +SOURCE NVGDefElement.cpp +SOURCE NVGElement.cpp +SOURCE NVGElementFactory.cpp +SOURCE NVGEllipseElement.cpp +SOURCE NVGEncoder.cpp +SOURCE NVGGElement.cpp +SOURCE NvgHeaderSection.cpp +SOURCE NVGLinearGradientElement.cpp +SOURCE NVGLineElement.cpp +SOURCE NvgOffsetVector.cpp +SOURCE NvgPaintSection.cpp +SOURCE NVGPathElement.cpp +SOURCE NvgPathSection.cpp +SOURCE NVGPolygonElement.cpp +SOURCE NVGRadialGradientElement.cpp +SOURCE NVGRectElement.cpp +SOURCE NVGStopElement.cpp +SOURCE NVGSVGElement.cpp + +USERINCLUDE ../Internal/SVGEngine/inc +USERINCLUDE ../Internal/Gfx2D/inc +USERINCLUDE ../Internal/Gfx2D/VGRasterizer/inc +USERINCLUDE ../Internal/Xmldomimpl/inc +USERINCLUDE ../Internal/SVGImpl/inc/SVGDOM +USERINCLUDE ../Internal/SVGImpl/inc +USERINCLUDE ../Internal/xmlReader/inc +USERINCLUDE ../Internal/Sax2Print +USERINCLUDE ../Internal/Nvg/inc +USERINCLUDE ../Internal/Path/inc + +//#ifndef SBSV2 +//START TOOLS +// win32_library /epoc32/release/tools/rel/xerces-c_2.lib +//END +//#endif + +staticlibrary xercesenc-c diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk Fri Mar 12 15:48:37 2010 +0200 @@ -0,0 +1,235 @@ +PROGRAM=/home/nokia/standalone/group/svgtbinencode.exe +OBJS=/home/nokia/standalone/group +PARENT_DIR=/home/nokia/standalone/group +SOURCES_CPP=../Internal/Gfx2D/src/GfxFloatFixPt.cpp \ +../Internal/Gfx2D/src/Gfxtrignometric.cpp \ +../Internal/Gfx2D/src/GfxGc/GfxColor.cpp \ +../Internal/Gfx2D/src/GfxGc/GfxGradientPaint.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxAffineTransform.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxEllipse2D.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxEllipseIteratorP.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxFlatteningPathIterator.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxGeneralPath.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxGeneralPathIteratorP.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxLine2D.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxLineIteratorP.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxPoint2D.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxRectangle2D.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxRectangleIteratorP.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxRectangularShape.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxRoundRectangle2D.cpp \ +../Internal/Gfx2D/src/GfxGeom/GfxRoundRectangleIteratorP.cpp \ +../Internal/Nvg/src/NVGCircleElement.cpp \ +../Internal/Nvg/src/NvgCommandSection.cpp \ +../Internal/Nvg/src/NVGDefElement.cpp \ +../Internal/Nvg/src/NVGElement.cpp \ +../Internal/Nvg/src/NVGElementFactory.cpp \ +../Internal/Nvg/src/NVGEllipseElement.cpp \ +../Internal/Nvg/src/NVGEncoder.cpp \ +../Internal/Nvg/src/NVGGElement.cpp \ +../Internal/Nvg/src/NvgHeaderSection.cpp \ +../Internal/Nvg/src/NVGLinearGradientElement.cpp \ +../Internal/Nvg/src/NVGLineElement.cpp \ +../Internal/Nvg/src/NvgOffsetVector.cpp \ +../Internal/Nvg/src/NvgPaintSection.cpp \ +../Internal/Nvg/src/NVGPathElement.cpp \ +../Internal/Nvg/src/NvgPathSection.cpp \ +../Internal/Nvg/src/NVGPolygonElement.cpp \ +../Internal/Nvg/src/NVGRadialGradientElement.cpp \ +../Internal/Nvg/src/NVGRectElement.cpp \ +../Internal/Nvg/src/NVGStopElement.cpp \ +../Internal/Nvg/src/NVGSVGElement.cpp \ +../Internal/Sax2Print/SAX2PrintHandlers.cpp \ +../Internal/SVGEngine/src/SVGAttributeVerifier.cpp \ +../Internal/SVGEngine/src/SVGContentHandler.cpp \ +../Internal/SVGEngine/src/Svgencoder.cpp \ +../Internal/SVGEngine/src/SVGEncoderMain.cpp \ +../Internal/SVGEngine/src/SVGEngineImpl.cpp \ +../Internal/SVGEngine/src/SVGErrorImpl.cpp \ +../Internal/SVGEngine/src/SVGEvent.cpp \ +../Internal/SVGEngine/src/SVGTEncodeInterfaceImpl.cpp \ +../Internal/SVGImpl/src/SVGAElementImpl.cpp \ +../Internal/SVGImpl/src/SVGAnimateElementImpl.cpp \ +../Internal/SVGImpl/src/SVGAnimateMotionElementImpl.cpp \ +../Internal/SVGImpl/src/SVGAnimateTransformElementImpl.cpp \ +../Internal/SVGImpl/src/SVGAnimationBase.cpp \ +../Internal/SVGImpl/src/SVGAnimTimeController.cpp \ +../Internal/SVGImpl/src/SVGAnimTimingParser.cpp \ +../Internal/SVGImpl/src/SVGAudioElementImpl.cpp \ +../Internal/SVGImpl/src/SVGCircleElementImpl.cpp \ +../Internal/SVGImpl/src/SVGClrCssValueImpl.cpp \ +../Internal/SVGImpl/src/SVGColor.cpp \ +../Internal/SVGImpl/src/SVGDiscardElementImpl.cpp \ +../Internal/SVGImpl/src/SVGDocumentImpl.cpp \ +../Internal/SVGImpl/src/SVGDOMImplementationImpl.cpp \ +../Internal/SVGImpl/src/SVGElementImpl.cpp \ +../Internal/SVGImpl/src/SVGEllipseElementImpl.cpp \ +../Internal/SVGImpl/src/SVGFitToViewBoxImpl.cpp \ +../Internal/SVGImpl/src/SVGFloatCssValueImpl.cpp \ +../Internal/SVGImpl/src/SVGFontElementImpl.cpp \ +../Internal/SVGImpl/src/SVGFontFaceElementImpl.cpp \ +../Internal/SVGImpl/src/SVGFontMap.cpp \ +../Internal/SVGImpl/src/SVGGElementImpl.cpp \ +../Internal/SVGImpl/src/SVGGlyphElementImpl.cpp \ +../Internal/SVGImpl/src/SVGGradientElementImpl.cpp \ +../Internal/SVGImpl/src/SVGImageElementImpl.cpp \ +../Internal/SVGImpl/src/SVGIntCssValueImpl.cpp \ +../Internal/SVGImpl/src/SVGLangSpaceImpl.cpp \ +../Internal/SVGImpl/src/SVGLinearGradientElementImpl.cpp \ +../Internal/SVGImpl/src/SVGLineElementImpl.cpp \ +../Internal/SVGImpl/src/SVGMediaAnimationElementImpl.cpp \ +../Internal/SVGImpl/src/SVGMediaElementBase.cpp \ +../Internal/SVGImpl/src/SVGMissingGlyphElementImpl.cpp \ +../Internal/SVGImpl/src/SVGMpathElementImpl.cpp \ +../Internal/SVGImpl/src/SVGPaintCssValueImpl.cpp \ +../Internal/SVGImpl/src/SVGPathDataParser.cpp \ +../Internal/SVGImpl/src/SVGPathElementImpl.cpp \ +../Internal/SVGImpl/src/SVGPointLexer.cpp \ +../Internal/SVGImpl/src/SVGPolylineElementImpl.cpp \ +../Internal/SVGImpl/src/SVGPreserveAspectRatioImpl.cpp \ +../Internal/SVGImpl/src/SVGRadialGradientElementImpl.cpp \ +../Internal/SVGImpl/src/SVGRectElementImpl.cpp \ +../Internal/SVGImpl/src/SVGRelToAbsPath.cpp \ +../Internal/SVGImpl/src/SVGSchemaData.cpp \ +../Internal/SVGImpl/src/SVGSetElementImpl.cpp \ +../Internal/SVGImpl/src/SVGSolidColorElementImpl.cpp \ +../Internal/SVGImpl/src/SVGStopElementImpl.cpp \ +../Internal/SVGImpl/src/SVGStrCssValueImpl.cpp \ +../Internal/SVGImpl/src/SVGStringTokenizer.cpp \ +../Internal/SVGImpl/src/SVGStyleElementImpl.cpp \ +../Internal/SVGImpl/src/SVGTestsImpl.cpp \ +../Internal/SVGImpl/src/SVGTextElementImpl.cpp \ +../Internal/SVGImpl/src/SVGTransformListImpl.cpp \ +../Internal/SVGImpl/src/SVGTransformableImpl.cpp \ +../Internal/SVGImpl/src/SVGUriReferenceImpl.cpp \ +../Internal/SVGImpl/src/SVGUseElementImpl.cpp \ +../Internal/SVGImpl/src/SVGVectorCssValueImpl.cpp \ +../Internal/SVGImpl/src/SvgHkernelementimpl.cpp \ +../Internal/SVGImpl/src/Svgsvgelementimpl.cpp \ +../Internal/testingsymdefcppdll/Buf.cpp \ +../Internal/testingsymdefcppdll/Des16.cpp \ +../Internal/testingsymdefcppdll/Des8.cpp \ +../Internal/testingsymdefcppdll/Desc16.cpp \ +../Internal/testingsymdefcppdll/Desc8.cpp \ +../Internal/testingsymdefcppdll/Hbufc16.cpp \ +../Internal/testingsymdefcppdll/Hbufc8.cpp \ +../Internal/testingsymdefcppdll/Rfile.cpp \ +../Internal/testingsymdefcppdll/Rpointerarraybase.cpp \ +../Internal/testingsymdefcppdll/Tbufbase16.cpp \ +../Internal/testingsymdefcppdll/Tbufbase8.cpp \ +../Internal/testingsymdefcppdll/TBufC.cpp \ +../Internal/testingsymdefcppdll/Tbufcbase16.cpp \ +../Internal/testingsymdefcppdll/Tbufcbase8.cpp \ +../Internal/testingsymdefcppdll/Tchar.cpp \ +../Internal/testingsymdefcppdll/TInt64.cpp \ +../Internal/testingsymdefcppdll/Tkeydesc8array.cpp \ +../Internal/testingsymdefcppdll/Tlex.cpp \ +../Internal/testingsymdefcppdll/Tptr16.cpp \ +../Internal/testingsymdefcppdll/Tptr8.cpp \ +../Internal/testingsymdefcppdll/Tptrc16.cpp \ +../Internal/testingsymdefcppdll/Tptrc8.cpp \ +../Internal/testingsymdefcppdll/Trgb.cpp \ +../Internal/testingsymdefcppdll/utf.cpp \ +../Internal/Xmldomimpl/src/SVGXmlElementImpl.cpp \ +../Internal/xmlReader/src/MyRXMLReader.cpp + +SOURCES_C=../Internal/Gfx2D/VGRasterizer/src/svgapi.c \ +../Internal/Gfx2D/VGRasterizer/src/svgpath.c \ +../Internal/Gfx2D/VGRasterizer/src/svgmath.c \ +../Internal/Gfx2D/VGRasterizer/src/svgsubdivide.c + + +OBJECTS_CPP_DEB=$(SOURCES_CPP:.cpp=.dbg.o) +OBJECTS_C_DEB=$(SOURCES_C:.c=.dbg.o) +OBJECTS_CPP_REL=$(SOURCES_CPP:.cpp=.o) +OBJECTS_C_REL=$(SOURCES_C:.c=.o) + +STLPORT_INC=/usr/local/lib +INCLUDES=-I "$(PARENT_DIR)" -I "$(PARENT_DIR)/inc" -I usr/include + # /I"$(EPOCROOT)epoc32/include" / + # /I"$(STLPORT_INC)" + +VPATH=$(PARENT_DIR) +CC=g++ -g +LINK=ld +LINK32_FLAGS=/home/nokia/standalone/lib_linux/libxercesenc-c.so.28 +DEFINES =-I "../Internal/SVGEngine/inc" \ +-I "../Internal/Gfx2D/inc" \ +-I "../Internal/Gfx2D/VGRasterizer/inc" \ +-I "../Internal/Xmldomimpl/inc" \ +-I "../Internal/SVGImpl/inc/SVGDOM" \ +-I "../Internal/SVGImpl/inc" \ +-I "../Internal/xmlReader/inc" \ +-I "../Internal/Sax2Print" \ +-I "../Internal/Nvg/inc" \ +-I "../Internal/Path/inc" -D ARM -D NDEBUG -D _CONSOLE -D _MBCS +#/YX /FD /c +#CLFLAGS = /Od /nologo /GF -W4 /Fd -GX +CLFLAGS =-ansi -umacro -fms-extensions -w -fshort-wchar -g3 +#/nologo /MT /GX +$(PROGRAM) : $(OBJECTS_CPP_REL) $(OBJECTS_C_REL) +# echo $(SOURCES_CPP) +# echo $(SOURCES_C) + g++ -g3 -lstdc++ -o $(PROGRAM) $(OBJECTS_CPP_REL) $(OBJECTS_C_REL) $(LINK32_FLAGS) + +#DEB : $(OBJECTS_CPP_DEB) + echo "DEB build Called" +# echo $(SOURCES_CPP) +# echo $(SOURCES_C) +# $(LINK) /OUT:"$(PROGRAM).dbg" $(OBJECTS_CPP_DEB) $(LINK32_FLAGS) + + +REL : $(OBJECTS_CPP_REL) $(OBJECTS_C_REL) + echo "REL build Called" +# echo $(SOURCES_CPP) +# echo $(SOURCES_C) + $(LINK) /OUT:"$(PROGRAM).rel" $(OBJECTS_CPP_REL) $(OBJECTS_C_REL) $(LINK32_FLAGS) + +%.o : %.cpp + $(CC) $(DEFINES) $(CLFLAGS) $(INCLUDES) -o "$@" -c $< + +%.dbg.o : %.cpp + $(CC) $(DEFINES) $(CLFLAGS) $(INCLUDES) -o "$@" -c $< + +%.o : %.c + $(CC) $(DEFINES) $(CLFLAGS) $(INCLUDES) -o "$@" -c $< + +%.dbg.o : %.c + $(CC) $(DEFINES) $(CLFLAGS) $(INCLUDES) -o "$@" -c $< + +#EB_install: $(PROGRAM).dbg +# echo $(PARENT_DIR) +# echo $(BUILD_DIR) +# echo $(CURDIR) +# copy /y "$(PARENT_DIR)/$(PROGRAM).dbg" "/epoc32/RELEASE/tools/deb/$(PROGRAM)" +# copy /y "/S60/mw/graphics/SVGTopt/SVGTEncoder/standalone/lib/$(OBJS)" "/epoc32/RELEASE/tools/deb/$(OBJS)" +#REL_install: $(PROGRAM).rel +# echo $(PARENT_DIR) +# echo $(BUILD_DIR) +# echo $(CURDIR) +# copy /y "$(PARENT_DIR)/$(PROGRAM).rel" "/epoc32/tools/$(PROGRAM)" +# copy /y "/S60/mw/graphics/SVGTopt/SVGTEncoder/standalone/lib/$(OBJS)" "/epoc32/tools/$(OBJS)" +#DEB_CLEAN: +# echo $(CURDIR) +# @chdir $(PARENT_DIR) && erase /f $(OBJECTS_CPP_DEB) 2>>nul +# @chdir $(PARENT_DIR) && erase /f $(OBJECTS_C_DEB) 2>>nul +# @chdir $(PARENT_DIR) && erase /f $(PROGRAM).dbg 2>>nul +# @erase /f "/epoc32/RELEASE/tools/deb/$(PROGRAM)" 2>>nul +# @erase /f "/epoc32/RELEASE/tools/deb/$(OBJS)" 2>>nul + +#REL_clean: +# echo $(CURDIR) +# @chdir $(PARENT_DIR) && erase /f $(OBJECTS_CPP_REL) 2>>nul +# @chdir $(PARENT_DIR) && erase /f $(OBJECTS_C_REL) 2>>nul +# @chdir $(PARENT_DIR) && erase /f $(PROGRAM).rel 2>>nul +# @erase /f "/epoc32/tools/$(PROGRAM)" 2>>nul +# @erase /f "/epoc32/tools/$(OBJS)" 2>>nul + + +clean : FORCE + cd ../; \ + find -name *.o -type f -exec rm {} \; + +FORCE: + + diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.a Binary file svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.a has changed diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.so.28 Binary file svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.so.28 has changed diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/lib_win/libxercesenc-c.a Binary file svgtencoder/svgtenc/standalone/lib_win/libxercesenc-c.a has changed diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/lib_win/xerces-c_2.lib Binary file svgtencoder/svgtenc/standalone/lib_win/xerces-c_2.lib has changed diff -r 2013ebce6d92 -r 134a83fd6d82 svgtencoder/svgtenc/standalone/lib_win/xerces-c_2_8.dll Binary file svgtencoder/svgtenc/standalone/lib_win/xerces-c_2_8.dll has changed