Modify MMP files to build OpenVG ref. impl. from stemkit and add to bld.inf.
--- a/group/bld.inf Wed Oct 20 10:26:40 2010 +0100
+++ b/group/bld.inf Wed Oct 20 11:50:05 2010 +0100
@@ -39,3 +39,8 @@
// Rebuild the "original" TimeZone localisation resources as they're eclipsed by something else in the PDK
/sf/mw/appsupport/tzservices/tzlocrscfactory/group/TzLocalizationRscFactory.mmp
+// VFP performance improvement for OpenVG SW reference implementation
+../perfopts/sfopenvg.mmp
+../perfopts/openvg.mmp
+../perfopts/openvgu.mmp
+
--- a/perfopts/openvg.mmp Wed Oct 20 10:26:40 2010 +0100
+++ b/perfopts/openvg.mmp Wed Oct 20 11:50:05 2010 +0100
@@ -13,9 +13,12 @@
* Description:
* openvg mmp file
*/
+// Modified to build from /sf/incubator/stemkit to enable VFP optimisation
+// builds against /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg
+
#include <vg\openvguids.hrh> // For uids
-target libopenvg_sw.dll // Destination filename
+target stem_libopenvg_sw.dll // Destination filename
targettype dll // Binary build type
uid KUidSharedDllUidValue KUidOpenVGDllUidValue // File uids
@@ -26,19 +29,19 @@
MACRO __OPENVGHEADERS_USE_VG_1_1
-userinclude ..\sfopenvg\include //for internal openvg functions e.g. do_vgXXX
+userinclude /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/include //for internal openvg functions e.g. do_vgXXX
OS_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(vg) // EGL include files
-sourcepath ..\openvg // Relative path to source files
+sourcepath . // Relative path to source files
source openvg.cpp
library euser.lib // Mandatory
-library sflibopenvgrefimpl.lib
+library stem_sflibopenvgrefimpl.lib
#ifdef WINS
DEFFILE \epoc32\include\def\win32\libopenvg11.def // WINS/WINSCW def file
--- a/perfopts/openvgu.mmp Wed Oct 20 10:26:40 2010 +0100
+++ b/perfopts/openvgu.mmp Wed Oct 20 11:50:05 2010 +0100
@@ -13,28 +13,31 @@
* Description:
* openvgu mmp file
*/
+// Modified to build from /sf/incubator/stemkit to enable VFP optimisation
+// builds against /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg
+
#include <vg\openvguids.hrh> // For uids
-target libopenvgu_sw.dll // Destination filename
+target stem_libopenvgu_sw.dll // Destination filename
targettype dll // Binary build type
uid KUidSharedDllUidValue KUidVGUDllUidValue // File uids
CAPABILITY CAP_GENERAL_DLL
vendorid 0x70000001
//noexportlibrary
-userinclude ..\sfopenvg\include //for internal egl functions e.g. do_eglXXX
+userinclude /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/include //for internal egl functions e.g. do_eglXXX
OS_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(vg) // EGL include files
macro __OPENVGHEADERS_USE_VG_1_1
-sourcepath ..\openvgu // Relative path to source files
+sourcepath . // Relative path to source files
source vgu.cpp
library euser.lib // Mandatory
-library sflibopenvgrefimpl.lib
+library stem_sflibopenvgrefimpl.lib
#ifdef WINS
DEFFILE \epoc32\include\def\win32\libopenvgu11.def // WINS/WINSCW def file
--- a/perfopts/sfopenvg.mmp Wed Oct 20 10:26:40 2010 +0100
+++ b/perfopts/sfopenvg.mmp Wed Oct 20 11:50:05 2010 +0100
@@ -13,9 +13,12 @@
* Description:
* sfopenvg mmp file
*/
+// Modified to build from /sf/incubator/stemkit to enable VFP optimisation
+// builds against /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg
+
#include <vg\openvguids.hrh> // For uids
-target sflibopenvgrefimpl.dll // Destination filename
+target stem_sflibopenvgrefimpl.dll // Destination filename
targettype dll // Binary build type
uid KUidSharedDllUidValue 0x10281CA6 // File uids
@@ -39,8 +42,8 @@
MACRO BUILD_WITH_PRIVATE_OPENVG //same meaning as macro BUILD_WITH_PRIVATE_EGL except applies to the OpenVG API.
//see riAPI.cpp
-userinclude ..\sfopenvg // Local include files
-userinclude ..\sfopenvg\include // Local include files
+userinclude /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg // Local include files
+userinclude /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/include // Local include files
OS_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
@@ -51,7 +54,7 @@
-sourcepath ..\sfopenvg // Relative path to source files
+sourcepath /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg // Relative path to source files
source riApi.cpp
source riContext.cpp
@@ -68,10 +71,12 @@
// use Nokia Platsim interfaces to provide EGL services
//for EGL
-SOURCEPATH ..\sfopenvg\symbian
+SOURCEPATH /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/symbian
SOURCE riEGLOS.cpp
-library libopenvg_sw.lib
+DEFFILE /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/~/sflibopenvgrefimpl.def
+
+library stem_libopenvg_sw.lib
library euser.lib // Mandatory
library fbscli.lib // For CFbsBitmap, etc
library bitgdi.lib // For CFbsBitmapDevice, CFbsBitGc, etc