--- a/cryptoservices/filebasedcertificateandkeystores/test/tkeystore/tkeystore.mmp Fri Oct 02 13:15:59 2009 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/test/tkeystore/tkeystore.mmp Mon Oct 12 10:17:04 2009 +0300
@@ -21,6 +21,8 @@
@SYMPurpose t_keystore.exe Test harness for keystore
*/
+MACRO ALTERNATE=1
+
TARGET t_keystore.exe
TARGETTYPE exe
@@ -59,14 +61,31 @@
#endif // SYMBIAN_AUTH_SERVER
USERINCLUDE ../../../../cryptomgmtlibs/securitytestfw/test/testhandler2
+USERINCLUDE ../../../../cryptomgmtlibs/securitytestfw/inc
USERINCLUDE ../tfiletokens
-SYSTEMINCLUDE ../../../../crypto/weakcrypto/inc
-SYSTEMINCLUDE ../../source/generic/client
-SYSTEMINCLUDE ../../source/generic/common
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../Inc
+USERINCLUDE ../../../../crypto/weakcrypto/inc
+USERINCLUDE ../../source/generic/client
+USERINCLUDE ../../source/generic/common
+USERINCLUDE ../../Inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+#if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
+USERINCLUDE ../tcryptotokenhai
+USERINCLUDE ../../../../crypto/weakcryptospi/inc
+USERINCLUDE ../../../../crypto/weakcryptospi/inc/spi
+#endif // SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT && SYMBIAN_ENABLE_SDP_ECC
+
+USERINCLUDE ../../../../crypto/weakcrypto/inc
+USERINCLUDE ../../source/generic/client
+USERINCLUDE ../../source/generic/common
+OS_LAYER_SYSTEMINCLUDE
+USERINCLUDE ../../Inc
+
+#if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
+SYSTEMINCLUDE /epoc32/include/cryptospi
+#endif // SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT && SYMBIAN_ENABLE_SDP_ECC
LIBRARY euser.lib efsrv.lib ecom.lib cryptography.lib
LIBRARY certstore.lib crypto.lib hash.lib
@@ -77,4 +96,9 @@
LIBRARY authclient.lib
#endif // SYMBIAN_AUTH_SERVER
+#if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
+LIBRARY tcryptotokenhai.lib
+LIBRARY cryptospi.lib
+#endif // SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT && SYMBIAN_ENABLE_SDP_ECC
+
SMPSAFE