diff -uNr tvcas_attachment_20120915/ICC/Multi2Decoder/Multi2DecoderSIMD.cpp tvcas_attachment_20120915_B25/ICC/Multi2Decoder/Multi2DecoderSIMD.cpp --- tvcas_attachment_20120915/ICC/Multi2Decoder/Multi2DecoderSIMD.cpp 2012-09-15 19:00:00.000000000 +0900 +++ tvcas_attachment_20120915_B25/ICC/Multi2Decoder/Multi2DecoderSIMD.cpp 2013-10-04 16:42:35.637258378 +0900 @@ -1,5 +1,5 @@ #include -#include "../../BonTsEngine/Multi2Decoder.h" +#include "../../TVCAS/Multi2Decoder.h" #include #include #ifdef MULTI2_SSSE3 diff -uNr tvcas_attachment_20120915/TVCAS/CardReader.cpp tvcas_attachment_20120915_B25/TVCAS/CardReader.cpp --- tvcas_attachment_20120915/TVCAS/CardReader.cpp 2012-09-15 19:00:00.000000000 +0900 +++ tvcas_attachment_20120915_B25/TVCAS/CardReader.cpp 2013-10-04 16:43:14.921140400 +0900 @@ -907,7 +907,7 @@ if (!GetLibraryFunc(m_hLib, pEstablishContext, "CasLinkEstablishContext") || !GetLibraryFunc(m_hLib, pListReaders, FUNC_NAME("CasLinkListReaders")) || !GetLibraryFunc(m_hLib, m_pCasLinkReleaseContext, "CasLinkReleaseContext") - || !GetLibraryFunc(m_hLib, m_pCasLinkConnect, "CasLinkConnect") + || !GetLibraryFunc(m_hLib, m_pCasLinkConnect, FUNC_NAME("CasLinkConnect")) || !GetLibraryFunc(m_hLib, m_pCasLinkDisconnect, "CasLinkDisconnect") || !GetLibraryFunc(m_hLib, m_pCasLinkTransmit, "CasLinkTransmit")) { ::FreeLibrary(m_hLib); diff -uNr tvcas_attachment_20120915/TVCAS/CardReader.h tvcas_attachment_20120915_B25/TVCAS/CardReader.h --- tvcas_attachment_20120915/TVCAS/CardReader.h 2012-09-15 19:00:00.000000000 +0900 +++ tvcas_attachment_20120915_B25/TVCAS/CardReader.h 2013-10-04 16:43:14.923215623 +0900 @@ -1,6 +1,8 @@ #ifndef CARD_READER_H #define CARD_READER_H +#define CARDREADER_SCARD_DYNAMIC_SUPPORT +#define CARDREADER_BONCASCLIENT_SUPPORT #include #include "BonBaseClass.h" diff -uNr tvcas_attachment_20120915/TVCAS/Multi2Decoder.h tvcas_attachment_20120915_B25/TVCAS/Multi2Decoder.h --- tvcas_attachment_20120915/TVCAS/Multi2Decoder.h 2012-09-15 19:00:00.000000000 +0900 +++ tvcas_attachment_20120915_B25/TVCAS/Multi2Decoder.h 2013-10-04 16:44:41.741466995 +0900 @@ -15,7 +15,7 @@ */ #define MULTI2_SSE2 // SSE2対応 #define MULTI2_SSSE3 // SSSE3対応 -#define MULTI2_SIMD_ICC // Intel C++ Compiler を利用する +//#define MULTI2_SIMD_ICC // Intel C++ Compiler を利用する namespace Multi2DecoderSIMD { struct WORKKEY;