diff --git a/TegExecutor.cpp b/TegExecutor.cpp index 06afb82..994f567 100644 --- a/TegExecutor.cpp +++ b/TegExecutor.cpp @@ -19,6 +19,7 @@ #include "/EgtDev/Include/EGnFileUtils.h" #include "/EgtDev/Include/EGnFileCompare.h" #include "/EgtDev/Include/EgnCmdParser.h" +#include "/EgtDev/Include/EGkDllMain.h" #include "/EgtDev/Include/EGkGeomDB.h" #include "/EgtDev/Include/EGkGdbExecutor.h" @@ -58,7 +59,7 @@ TegExecutor::Execute( const string& sCmd1, const string& sCmd2, const STRVECTOR& sOut += *theConstIter ; } sOut += "]" ; - LOG_DEBUG( m_pLogger, sOut.c_str()) ; + LOG_DBG_INFO( m_pLogger, sOut.c_str()) ; // esecuzione comando if ( sCmd1 == "RUN") { @@ -108,8 +109,9 @@ TegExecutor::ExecuteRun( const string& sCmd2, const STRVECTOR& vsParams) } // inizializzazioni - pGdb->Init( m_pLogger) ; - pGdbExec->Init( Get( pGdb), m_pLogger) ; + SetEGkLogger( m_pLogger) ; + pGdb->Init() ; + pGdbExec->Init( Get( pGdb)) ; if ( ! pCmdParser->Init( vsParams[0], Get( pGdbExec), m_pLogger)) { string sOut = "Error on Parser.Init (" + vsParams[0] + ")" ; LOG_ERROR( m_pLogger, sOut.c_str()) ; diff --git a/TestEGk.cpp b/TestEGk.cpp index 0554446..aaa618e 100644 --- a/TestEGk.cpp +++ b/TestEGk.cpp @@ -15,11 +15,11 @@ #include "stdafx.h" #include "TegExecutor.h" #include "/EgtDev/Include/EgnGetModuleVer.h" -#include "/EgtDev/Include/EGnVersion.h" +#include "/EgtDev/Include/EGnDllMain.h" #include "/EgtDev/Include/EGnStringUtils.h" #include "/EgtDev/Include/EGnStringConverter.h" #include "/EgtDev/Include/EgnCmdParser.h" -#include "/EgtDev/Include/EGkVersion.h" +#include "/EgtDev/Include/EGkDllMain.h" #include "/EgtDev/Include/EGkGeomDB.h" #include "/EgtDev/Include/EGkGdbExecutor.h" #include "/EgtDev/Include/EgtPointerOwner.h" diff --git a/TestEGk.rc b/TestEGk.rc index 9423bcc..0e6703e 100644 Binary files a/TestEGk.rc and b/TestEGk.rc differ diff --git a/TestEGk.vcxproj b/TestEGk.vcxproj index 28638ec..22233cd 100644 --- a/TestEGk.vcxproj +++ b/TestEGk.vcxproj @@ -93,13 +93,14 @@ + - + + - diff --git a/TestEGk.vcxproj.filters b/TestEGk.vcxproj.filters index d19a101..9d41ba4 100644 --- a/TestEGk.vcxproj.filters +++ b/TestEGk.vcxproj.filters @@ -18,15 +18,9 @@ File di intestazione - - File di intestazione - File di intestazione - - File di intestazione - File di intestazione @@ -57,6 +51,15 @@ File di intestazione + + File di intestazione + + + File di intestazione + + + File di intestazione +