Parcourir la source

Kleine Änderungen an der PC-Version

Rind il y a 1 an
Parent
commit
3661372b27
1 fichiers modifiés avec 19 ajouts et 2 suppressions
  1. 19 2
      src/main.cpp

+ 19 - 2
src/main.cpp

@@ -22,8 +22,10 @@
 #include <gfa/gfaipc.h>
 #include "stgdevinfo.h"
 #include "mysqlinfo.h"
+#ifdef _TARGET_BUILD
 #include "spiinfo.h"
 #include "adcinfo.h"
+#endif	//	_TARGET_BUILD
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -140,10 +142,12 @@ int main(int argc, char *argv[])
 	std::string sDbUser, sDbPass;
 	CMySqlInfo mySqlInfo;
 	CStgDevInfo stgDevInfo;
+#ifdef _TARGET_BUILD
 	CSpiInfo spiInfo;
 	CAdcInfo adcInfo;
-	bool bOsIsHypervised = stgDevInfo.IsSystemHypervised();
 	bool bTargetHasTiva = spiInfo.TargetHasTiva();
+#endif	//	_TARGET_BUILD
+	bool bOsIsHypervised = stgDevInfo.IsSystemHypervised();
 	bool bStateTransition, bUpdateStgDevInfo;
 
 	/////////////////////////////////////////////////////////////////////////
@@ -188,7 +192,6 @@ int main(int argc, char *argv[])
 
 	CMySqlInfo::EXEC_PARAMS myep;
 	CStgDevInfo::EXEC_PARAMS step;
-	CSpiInfo::EXEC_PARAMS spep;
 
 	do
 	{
@@ -225,6 +228,9 @@ int main(int argc, char *argv[])
 			stgDevInfo.Create(&step);
 		}
 
+#ifdef _TARGET_BUILD
+		CSpiInfo::EXEC_PARAMS spep;
+
 		if(bTargetHasTiva)
 		{
 			spep = {hAC};
@@ -235,6 +241,7 @@ int main(int argc, char *argv[])
 			spep = {hAC};
 			adcInfo.Create(&spep);
 		}
+#endif	//	_TARGET_BUILD
 
 		g_fZombie = false;
 		g_fRun = true;
@@ -244,10 +251,12 @@ int main(int argc, char *argv[])
 		if(!bOsIsHypervised)
 			stgDevInfo.Signal(CStgDevInfo::S_Init);
 
+#ifdef _TARGET_BUILD
 		if(bTargetHasTiva)
 			spiInfo.Signal(CSpiInfo::S_Init);
 		else
 			adcInfo.Signal(CAdcInfo::S_Init);
+#endif	//	_TARGET_BUILD
 	}
 	while(false);
 
@@ -287,10 +296,12 @@ int main(int argc, char *argv[])
 					if(!bOsIsHypervised)
 						stgDevInfo.Signal(CStgDevInfo::S_Pause);
 
+#ifdef _TARGET_BUILD
 					if(bTargetHasTiva)
 						spiInfo.Signal(CSpiInfo::S_Pause);
 					else
 						adcInfo.Signal(CAdcInfo::S_Pause);
+#endif	//	_TARGET_BUILD
 				}
 				else
 				{
@@ -299,10 +310,12 @@ int main(int argc, char *argv[])
 					if(!bOsIsHypervised)
 						stgDevInfo.Signal(CStgDevInfo::S_Resume);
 
+#ifdef _TARGET_BUILD
 					if(bTargetHasTiva)
 						spiInfo.Signal(CSpiInfo::S_Resume);
 					else
 						adcInfo.Signal(CAdcInfo::S_Resume);
+#endif	//	_TARGET_BUILD
 				}
 			}
 
@@ -337,20 +350,24 @@ int main(int argc, char *argv[])
 	if(!bOsIsHypervised)
 		stgDevInfo.Signal(CStgDevInfo::S_Terminate);
 
+#ifdef _TARGET_BUILD
 	if(bTargetHasTiva)
 		spiInfo.Signal(CSpiInfo::S_Terminate);
 	else
 		adcInfo.Signal(CAdcInfo::S_Terminate);
+#endif	//	_TARGET_BUILD
 
 	mySqlInfo.Join(nullptr);
 
 	if(!bOsIsHypervised)
 		stgDevInfo.Join(nullptr);
 
+#ifdef _TARGET_BUILD
 	if(bTargetHasTiva)
 		spiInfo.Join(nullptr);
 	else
 		adcInfo.Join(nullptr);
+#endif	//	_TARGET_BUILD
 
 	if(g_fZombie)
 	{