# HG changeset patch
# User hgs
# Date 1278428575 -28800
# Node ID cb7fbea28c8cdd73bd632d9a3dfdd1e03c2b9042
# Parent  e21deeeacad2db797a4b5aa7841bd94cdf776426
201027

diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/binary/svgtbinencode
Binary file svgtencoder/svgtenc/standalone/binary/svgtbinencode has changed
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe
Binary file svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe has changed
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/binary/xerces-c_2_6.dll
Binary file svgtencoder/svgtenc/standalone/binary/xerces-c_2_6.dll has changed
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/group/bld.inf
--- a/svgtencoder/svgtenc/standalone/group/bld.inf	Tue Jun 22 19:03:35 2010 +0800
+++ b/svgtencoder/svgtenc/standalone/group/bld.inf	Tue Jul 06 23:02:55 2010 +0800
@@ -30,7 +30,7 @@
 	//START TOOLS
 		//#if defined(TOOLS) 
 				../binary/svgtbinencode.exe	/epoc32/tools/svgtbinencode.exe
-				../binary/xerces-c_2_6.dll	/epoc32/tools/xerces-c_2_6.dll
+				../binary/svgtbinencode	/epoc32/tools/svgtbinencode
 				// 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
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp
--- a/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp	Tue Jun 22 19:03:35 2010 +0800
+++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoder.mmp	Tue Jul 06 23:02:55 2010 +0800
@@ -25,7 +25,7 @@
 // level 3. Also require RTTI.
 
 option MSVC /GX /W3 /GR
-option GCC  -w -DXML_LIBRARY
+option GCC  -w -DXML_LIBRARY -m32
 
 SOURCEPATH ../Internal/xmlReader/src
 SOURCE MyRXMLReader.cpp
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk
--- a/svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk	Tue Jun 22 19:03:35 2010 +0800
+++ b/svgtencoder/svgtenc/standalone/group/svgtbinencoderlinux.mk	Tue Jul 06 23:02:55 2010 +0800
@@ -1,22 +1,6 @@
-#
-# Copyright (c) 2009 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:
-#
-
-PROGRAM=/home/nokia/standalone/group/svgtbinencode.exe
-OBJS=/home/nokia/standalone/group
-PARENT_DIR=/home/nokia/standalone/group
+PROGRAM=svgtbinencode
+OBJS=.
+PARENT_DIR=.
 SOURCES_CPP=../Internal/Gfx2D/src/GfxFloatFixPt.cpp \
 ../Internal/Gfx2D/src/Gfxtrignometric.cpp \
 ../Internal/Gfx2D/src/GfxGc/GfxColor.cpp \
@@ -166,9 +150,14 @@
 	 # /I"$(STLPORT_INC)"
 
 VPATH=$(PARENT_DIR)
-CC=g++ -g
+
+# Uncomment this, to generate a debug version.
+# debug=-g3
+
+CC=g++ -O2 -m32 $(debug)
+
 LINK=ld
-LINK32_FLAGS=/home/nokia/standalone/lib_linux/libxercesenc-c.so.28
+LINK32_FLAGS=-L../lib_linux -lxercesenc-c
 DEFINES =-I "../Internal/SVGEngine/inc" \
 -I "../Internal/Gfx2D/inc" \
 -I "../Internal/Gfx2D/VGRasterizer/inc" \
@@ -181,12 +170,12 @@
 -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 
+CLFLAGS =-ansi -umacro -fms-extensions -w -fshort-wchar $(debug)
 #/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)
+	$(CC) -lstdc++ -lpthread -o $(PROGRAM) $(OBJECTS_CPP_REL) $(OBJECTS_C_REL) $(LINK32_FLAGS)
 
 #DEB : $(OBJECTS_CPP_DEB) 
 	echo "DEB build Called"
@@ -247,5 +236,3 @@
 	find -name *.o -type f -exec rm {} \;
 
 FORCE:
-
-
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.a
Binary file svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.a has changed
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.so.28
Binary file svgtencoder/svgtenc/standalone/lib_linux/libxercesenc-c.so.28 has changed
diff -r e21deeeacad2 -r cb7fbea28c8c svgtencoder/svgtenc/standalone/lib_win/libxercesenc-c.a
Binary file svgtencoder/svgtenc/standalone/lib_win/libxercesenc-c.a has changed