Add MMP files to build libOpenVG_sw.lib which uses LINKAS to redirect to libOpenVG.dll (and
the same for libEGL_sw.lib and libOpenVGU_sw.lib).
Only the libEGL_sw.lib redirection isn't activated - this can't happen until there is a merged
libEGL.dll which supports the OpenWF synchronisation and also implements the graphical support functions.
The overall aim is to eliminate the *_sw.dll implementations, at least as a compile-time way of choosing
a software-only implementation.The correct way to choose is to put the right set of libraries into a ROM
with suitable renaming, and in the emulator to use the "switching DLL" technique to pick the right set.
As the Symbian Foundation doesn't have any alternative implementations, we don't need the switching DLLs
and we can build directly to the correct name.
--- a/openvg/openvgrefimplementation/sfopenvg/group/bld.inf Fri May 28 16:02:15 2010 +0100
+++ b/openvg/openvgrefimplementation/sfopenvg/group/bld.inf Thu Jun 03 17:39:46 2010 +0100
@@ -29,6 +29,10 @@
vgi.mmp
sfopenvg.mmp
+openvg_sw.mmp
+openvgu_sw.mmp
+//egl_sw.mmp
+
// PRJ_TESTMMPFILES
#include "..\test\group\bld.inf"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/openvg/openvgrefimplementation/sfopenvg/group/egl_sw.mmp Thu Jun 03 17:39:46 2010 +0100
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2010 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* 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".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Remove libEGL_sw.dll by creating libEGL_sw.lib which redirects to the real libEGL.dll
+*/
+
+#include <egl/egluids.hrh> // For uids
+
+target libEGL_sw.lib // Destination filename
+targettype implib // Binary build type
+linkas libEGL.dll
+
+#ifdef WINS
+deffile /epoc32/include/def/win32/libegl13.def // should be exported to epoc32\include\def\bwins for the "~" syntax
+#else
+deffile /epoc32/include/def/~/libegl13.def
+#endif // WINS
+
+uid KUidSharedDllUidValue KUidEGLDllUidValue // File uids
+
+
--- a/openvg/openvgrefimplementation/sfopenvg/group/openvg.mmp Fri May 28 16:02:15 2010 +0100
+++ b/openvg/openvgrefimplementation/sfopenvg/group/openvg.mmp Thu Jun 03 17:39:46 2010 +0100
@@ -15,14 +15,14 @@
*/
#include <vg\openvguids.hrh> // For uids
-target libopenvg_sw.dll // Destination filename
+target libopenvg.dll // Destination filename
targettype dll // Binary build type
uid KUidSharedDllUidValue KUidOpenVGDllUidValue // File uids
CAPABILITY ALL -tcb
vendorid 0x70000001
-//noexportlibrary
+noexportlibrary
MACRO __OPENVGHEADERS_USE_VG_1_1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/openvg/openvgrefimplementation/sfopenvg/group/openvg_sw.mmp Thu Jun 03 17:39:46 2010 +0100
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2010 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* 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".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Remove libOpenVG_sw.dll by creating libOpenVG_sw.lib which redirects to the real libOpenVG.dll
+*/
+
+#include <vg\openvguids.hrh> // For uids
+
+target libOpenVG_sw.lib
+targettype implib
+linkas libOpenVG.dll
+
+#ifdef WINS
+deffile /epoc32/include/def/win32/libopenvg11.def // should be exported to epoc32\include\def\bwins for the "~" syntax
+#else
+deffile /epoc32/include/def/~/libopenvg11.def
+#endif // WINS
+
+uid KUidSharedDllUidValue KUidOpenVGDllUidValue // File uids
+
+
--- a/openvg/openvgrefimplementation/sfopenvg/group/openvgu.mmp Fri May 28 16:02:15 2010 +0100
+++ b/openvg/openvgrefimplementation/sfopenvg/group/openvgu.mmp Thu Jun 03 17:39:46 2010 +0100
@@ -15,12 +15,12 @@
*/
#include <vg\openvguids.hrh> // For uids
-target libopenvgu_sw.dll // Destination filename
+target libopenvgu.dll // Destination filename
targettype dll // Binary build type
uid KUidSharedDllUidValue KUidVGUDllUidValue // File uids
CAPABILITY CAP_GENERAL_DLL
vendorid 0x70000001
-//noexportlibrary
+noexportlibrary
userinclude ..\sfopenvg\include //for internal egl functions e.g. do_eglXXX
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/openvg/openvgrefimplementation/sfopenvg/group/openvgu_sw.mmp Thu Jun 03 17:39:46 2010 +0100
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2010 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* 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".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Remove libOpenVGU_sw.dll by creating libOpenVGU_sw.lib which redirects to the real libOpenVGU.dll
+*/
+
+#include <vg\openvguids.hrh> // For uids
+
+target libOpenVGU_sw.lib
+targettype implib
+linkas libOpenVG.dll
+
+#ifdef WINS
+deffile /epoc32/include/def/win32/libopenvgu11.def // should be exported to epoc32/include/def/bwins for the "~" syntax
+#else
+deffile /epoc32/include/def/~/libopenvgu11.def
+#endif // WINS
+
+uid KUidSharedDllUidValue KUidVGUDllUidValue // File uids
+
+