浏览代码

Z991239-5462 #comment modify spgen to generate params adapting to multi system.

chenliangyu 1 年之前
父节点
当前提交
c2dc083a22

+ 1 - 1
Framework/CMakeLists.txt

@@ -3,7 +3,7 @@ set(RVC_CONAN_DEP_LIBS2)
 if(MSVC)
 set(WITH_QT_GUI OFF)
 else()
-set(WITH_QT_GUI ON)
+set(WITH_QT_GUI OFF)
 endif(MSVC)
 
 set(KYSM_LIBRARY_NAME ${CONAN_LIBS_LIBKYSM})

+ 8 - 8
Module/mod_ResourceWatcher/ResourceWatcher_def_g.h

@@ -100,20 +100,20 @@ struct ResourceWatcherService_OperateFile_Ans
 	CSimpleStringA header;
 	int attachment1;
 	CSimpleStringA attachment2;
-	unsigned __int64 fileSize;
-	unsigned __int64 ftCreate;
-	unsigned __int64 ftModified;
-	unsigned __int64 ftAccess;
+	u__int64_t fileSize;
+	u__int64_t ftCreate;
+	u__int64_t ftModified;
+	u__int64_t ftAccess;
 	unsigned int fileAttribute;
 	unsigned int forbidAttribute;
 	int reversed1;
 	CSimpleStringA reversed2;
 	int count;
 	CAutoArray<CSimpleStringA> fileNames;
-	CAutoArray<unsigned __int64> fileSizes;
-	CAutoArray<unsigned __int64> ftCreates;
-	CAutoArray<unsigned __int64> ftModifieds;
-	CAutoArray<unsigned __int64> ftAccesses;
+	CAutoArray<u__int64_t> fileSizes;
+	CAutoArray<u__int64_t> ftCreates;
+	CAutoArray<u__int64_t> ftModifieds;
+	CAutoArray<u__int64_t> ftAccesses;
 	CAutoArray<unsigned int> fileAttributes;
 	CAutoArray<unsigned int> forbidAttributes;
 	CAutoArray<int> reserved1;

+ 0 - 32
Module/mod_ResourceWatcher/ResourceWatcher_msg_g.h

@@ -1,32 +0,0 @@
-
-#ifndef __RESOURCEWATCHER_MSG_G_H
-#define __RESOURCEWATCHER_MSG_G_H
-
-#pragma once
-
-// This code is generated by spgen tool!
-
-#include "SpHelper.h"
-
-namespace ResourceWatcher {
-#define eMsg_BrowserCacheClean 2
-
-#define eMsgSig_BrowserCacheClean 1728030659
-
-	struct BrowserCacheClean
-	{
-		int needClean;
-		int reversed1;
-		CSimpleStringA reversed2;
-
-		void Serialize(SpBuffer& Buf)
-		{
-			auto& buf = Buf & needClean & reversed1 & reversed2;
-		}
-
-	};
-
-	///////////////////////////
-
-} // namespace ResourceWatcher
-#endif // __RESOURCEWATCHER_MSG_G_H

+ 4 - 4
Tool/spgen/CPPGenerator.cs

@@ -16,8 +16,8 @@ namespace spgen
             "unsigned char",
             "int",
             "unsigned int",
-            "__int64",
-            "unsigned __int64",
+            "int64_t",
+            "u__int64_t",
             "double",
             "float",
             "CSimpleStringA",
@@ -30,8 +30,8 @@ namespace spgen
             "CAutoArray<unsigned char>",
             "CAutoArray<int>",
             "CAutoArray<unsigned int>",
-            "CAutoArray<__int64>",
-            "CAutoArray<unsigned __int64>",
+            "CAutoArray<int64_t>",
+            "CAutoArray<u__int64_t>",
             "CAutoArray<double>",
             "CAutoArray<float>",
             "CAutoArray<CSimpleStringA>",