# HG changeset patch # User markw # Date 1287590895 -3600 # Node ID 59f45c8582d367e56377a0c64dd4bed2ecfbc45b # Parent 2cad7c5d7db80dd5bb4b2ca6035addcd2b095459 Resolve ROM linking issues (via use of NOEXPORTLIBRARY in MMP files) and update rom content and static dependencies. Stemkit Syborg ROM now built with VFP OpenVG software reference by default. diff -r 2cad7c5d7db8 -r 59f45c8582d3 perfopts/openvg.mmp --- a/perfopts/openvg.mmp Wed Oct 20 12:07:07 2010 +0100 +++ b/perfopts/openvg.mmp Wed Oct 20 17:08:15 2010 +0100 @@ -25,7 +25,7 @@ CAPABILITY ALL -tcb vendorid 0x70000001 -//noexportlibrary +noexportlibrary armfpu vfpv2 @@ -43,7 +43,7 @@ source openvg.cpp library euser.lib // Mandatory -library stem_sflibopenvgrefimpl.lib +library sflibopenvgrefimpl.lib #ifdef WINS DEFFILE \epoc32\include\def\win32\libopenvg11.def // WINS/WINSCW def file diff -r 2cad7c5d7db8 -r 59f45c8582d3 perfopts/openvgu.mmp --- a/perfopts/openvgu.mmp Wed Oct 20 12:07:07 2010 +0100 +++ b/perfopts/openvgu.mmp Wed Oct 20 17:08:15 2010 +0100 @@ -23,7 +23,7 @@ uid KUidSharedDllUidValue KUidVGUDllUidValue // File uids CAPABILITY CAP_GENERAL_DLL vendorid 0x70000001 -//noexportlibrary +noexportlibrary armfpu vfpv2 @@ -39,7 +39,7 @@ source vgu.cpp library euser.lib // Mandatory -library stem_sflibopenvgrefimpl.lib +library sflibopenvgrefimpl.lib #ifdef WINS DEFFILE \epoc32\include\def\win32\libopenvgu11.def // WINS/WINSCW def file diff -r 2cad7c5d7db8 -r 59f45c8582d3 perfopts/sfopenvg.mmp --- a/perfopts/sfopenvg.mmp Wed Oct 20 12:07:07 2010 +0100 +++ b/perfopts/sfopenvg.mmp Wed Oct 20 17:08:15 2010 +0100 @@ -24,6 +24,7 @@ uid KUidSharedDllUidValue 0x10281CA6 // File uids CAPABILITY ALL -tcb vendorid 0x70000001 +noexportlibrary armfpu vfpv2 @@ -77,7 +78,7 @@ DEFFILE /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/~/sflibopenvgrefimpl.def -library stem_libopenvg_sw.lib +library libopenvg_sw.lib library euser.lib // Mandatory library fbscli.lib // For CFbsBitmap, etc library bitgdi.lib // For CFbsBitmapDevice, CFbsBitGc, etc diff -r 2cad7c5d7db8 -r 59f45c8582d3 syborg_stem/rom_content.csv --- a/syborg_stem/rom_content.csv Wed Oct 20 12:07:07 2010 +0100 +++ b/syborg_stem/rom_content.csv Wed Oct 20 17:08:15 2010 +0100 @@ -4274,8 +4274,8 @@ sys\bin\libgthread.dll,/epoc32/release/armv5/urel/libgthread.dll,core/os/glib.iby,os/ossrv,,, sys\bin\LibLogger.dll,/epoc32/release/armv5/urel/liblogger.dll,openenv.iby,os/ossrv,,, sys\bin\libm.dll,/epoc32/release/armv5/urel/libm.dll,openenv.iby,os/ossrv,,, -Sys\Bin\libopenvg_sw.dll,/epoc32/release/armv5/urel/libopenvg_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,,, -Sys\Bin\libopenvgu_sw.dll,/epoc32/release/armv5/urel/libopenvgu_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,,, +Sys\Bin\libopenvg_sw.dll,/epoc32/release/armv5/urel/libopenvg_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,Stem,MW,Performance optimisation +Sys\Bin\libopenvgu_sw.dll,/epoc32/release/armv5/urel/libopenvgu_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,Stem,MW,Performance optimisation sys\bin\libpthread.dll,/epoc32/release/armv5/urel/libpthread.dll,openenv.iby,os/ossrv,,, sys\bin\librt.dll,/epoc32/release/armv5/urel/librt.dll,oelibrt.iby,os/ossrv,,, sys\bin\libssl.dll,/epoc32/release/armv5/urel/libssl.dll,core/os/ssl.iby,os/ossrv,,, @@ -5373,7 +5373,7 @@ Sys\Bin\SetUpEventListCmd.dll,/epoc32/release/armv5/urel/setupeventlistcmd.dll,core/mw/satserver.iby,mw/phonesrv,,, Sys\Bin\SetUpIdleModeTextCmd.dll,/epoc32/release/armv5/urel/setupidlemodetextcmd.dll,core/mw/satserver.iby,mw/phonesrv,,, Sys\Bin\SetUpMenuCmd.dll,/epoc32/release/armv5/urel/setupmenucmd.dll,core/mw/satserver.iby,mw/phonesrv,,, -sys\bin\sflibopenvgrefimpl.dll,/epoc32/release/armv5/urel/sflibopenvgrefimpl.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,,, +sys\bin\sflibopenvgrefimpl.dll,/epoc32/release/armv5/urel/sflibopenvgrefimpl.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,Stem,MW,Performance optimisation sys\bin\Sharpness.pgn,/epoc32/release/armv5/urel/sharpness.pgn,core/app/ImageEditorSharpnessPlugin.iby,app/imgeditor,,, sys\bin\shiftjis_docomo_shared.dll,/epoc32/release/armv5/urel/shiftjis_docomo_shared.dll,charconv_japanese_docomo.iby,os/textandloc,,, Sys\Bin\shiftjis_ntt_docomo.dll,/epoc32/release/armv5/urel/shiftjis_ntt_docomo.dll,charconv_japanese_docomo.iby,os/textandloc,,, diff -r 2cad7c5d7db8 -r 59f45c8582d3 syborg_stem/static_dependencies.txt --- a/syborg_stem/static_dependencies.txt Wed Oct 20 12:07:07 2010 +0100 +++ b/syborg_stem/static_dependencies.txt Wed Oct 20 17:08:15 2010 +0100 @@ -4109,3 +4109,6 @@ private\10003a3f\import\apps\weatherinfo_reg.rsc /epoc32/data/z/private/10003a3f/import/apps/weatherinfo_reg.rsc sys\bin\weatherinfo.exe resource\apps\weatherinfo.rsc /epoc32/data/z/resource/apps/weatherinfo.rsc sys\bin\weatherinfo.exe sys\bin\weatherinfo.exe /epoc32/release/armv5/urel/weatherinfo.exe sid=a000cf77:QtCore[2001b2dc].dll:QtGui[2001b2dd].dll:QtNetwork[2001b2de].dll:QtSvg[2001b2e2].dll:commdb[10004e1c].dll:dfpaeabi.dll:drtaeabi.dll:esock[10003d3f].dll:euser[100039e5].dll:libc[10207369].dll:stdnew[20022178].dll +Sys\Bin\libopenvg_sw.dll /epoc32/release/armv5/urel/stem_libopenvg_sw.dll sid=10281ab9:stem_sflibopenvgrefimpl[10281ca6].dll +Sys\Bin\libopenvgu_sw.dll /epoc32/release/armv5/urel/stem_libopenvgu_sw.dll sid=10281c47:stem_sflibopenvgrefimpl[10281ca6].dll +sys\bin\sflibopenvgrefimpl.dll /epoc32/release/armv5/urel/stem_sflibopenvgrefimpl.dll sid=10281ca6:drtaeabi.dll:euser[100039e5].dll:fbscli[10003a15].dll:libm[102750d2].dll:libstdcpp[10282872].dll:stem_libopenvg_sw[10281ab9].dll