From c33f4c5e277a89a70f26838f31d8a550707f653e Mon Sep 17 00:00:00 2001 From: RimuruChan Date: Fri, 23 Sep 2022 19:23:15 +0800 Subject: [PATCH] Add status version --- .clang-format | 10 ++++++---- .clangd | 2 +- LiteLoader/include/liteloader/Version.h | 7 ++++--- ScriptEngine/src/res/ScriptEngine.rc | 3 +-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.clang-format b/.clang-format index ff36590162..1290f651b2 100644 --- a/.clang-format +++ b/.clang-format @@ -6,11 +6,11 @@ AlignAfterOpenBracket: Align AlignConsecutiveAssignments: None AlignConsecutiveDeclarations: None AlignOperands: Align -AlwaysBreakTemplateDeclarations : Yes +AlwaysBreakTemplateDeclarations: Yes AlignTrailingComments: true -AllowAllArgumentsOnNextLine : true +AllowAllArgumentsOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine : Always +AllowShortBlocksOnASingleLine: Always AllowShortCaseLabelsOnASingleLine: false AllowShortIfStatementsOnASingleLine: false AllowShortLoopsOnASingleLine: false @@ -22,6 +22,8 @@ BinPackArguments: true BinPackParameters: true ConstructorInitializerIndentWidth: 0 ConstructorInitializerAllOnOneLineOrOnePerLine: true +BreakBeforeConceptDeclarations: Always +RequiresClausePosition: OwnLine ColumnLimit: 120 CommentPragmas: '^ IWYU pragma:' PointerAlignment: Left @@ -29,7 +31,7 @@ IndentWidth: 4 SortIncludes: Never MaxEmptyLinesToKeep: 2 SpacesInSquareBrackets: false -SpacesInParentheses : false +SpacesInParentheses: false SpaceBeforeAssignmentOperators: true SpacesInContainerLiterals: true IndentWrappedFunctionNames: true diff --git a/.clangd b/.clangd index a6d90dbc3c..60667acb80 100644 --- a/.clangd +++ b/.clangd @@ -1,4 +1,4 @@ Diagnostics: Suppress: ["-Wmicrosoft-enum-forward-reference", "-Wc++11-narrowing"] CompileFlags: - Add: ["-ferror-limit=0", "-D__FUNCTION__=\"dummy\"", "-D_CRT_USE_BUILTIN_OFFSETOF"] + Add: ["-ferror-limit=0", "-D__FUNCTION__=\"dummy\"", "-D_CRT_USE_BUILTIN_OFFSETOF", "-D__cpp_lib_char8_t"] diff --git a/LiteLoader/include/liteloader/Version.h b/LiteLoader/include/liteloader/Version.h index 62acd0b5ad..3c5de0af4c 100644 --- a/LiteLoader/include/liteloader/Version.h +++ b/LiteLoader/include/liteloader/Version.h @@ -9,6 +9,7 @@ #define LITELOADER_VERSION_REVISION 0 #define LITELOADER_VERSION_ACTIONS 0 #define LITELOADER_VERSION_STATUS LITELOADER_VERSION_DEV +#define LITELOADER_VERSION_STATUS_VERSION 1 #define TARGET_BDS_PROTOCOL_VERSION 554 @@ -21,11 +22,11 @@ // Used in LiteLoader.rc or ScriptEngine.rc #if LITELOADER_VERSION_STATUS == LITELOADER_VERSION_BETA #define LITELOADER_FILE_VERSION_FLAG VS_FF_DEBUG -#define LITELOADER_FILE_VERSION_STRING TO_VERSION_STRING_EXPAND(LITELOADER_VERSION_MAJOR.LITELOADER_VERSION_MINOR.LITELOADER_VERSION_REVISION.LITELOADER_VERSION_ACTIONS BETA) +#define LITELOADER_FILE_VERSION_STRING TO_VERSION_STRING_EXPAND(LITELOADER_VERSION_MAJOR.LITELOADER_VERSION_MINOR.LITELOADER_VERSION_REVISION.LITELOADER_VERSION_ACTIONS.BETA.LITELOADER_VERSION_STATUS_VERSION) #elif LITELOADER_VERSION_STATUS == LITELOADER_VERSION_DEV #define LITELOADER_FILE_VERSION_FLAG VS_FF_PRIVATEBUILD -#define LITELOADER_FILE_VERSION_STRING TO_VERSION_STRING_EXPAND(LITELOADER_VERSION_MAJOR.LITELOADER_VERSION_MINOR.LITELOADER_VERSION_REVISION.LITELOADER_VERSION_ACTIONS DEV) +#define LITELOADER_FILE_VERSION_STRING TO_VERSION_STRING_EXPAND(LITELOADER_VERSION_MAJOR.LITELOADER_VERSION_MINOR.LITELOADER_VERSION_REVISION.LITELOADER_VERSION_ACTIONS.DEV.LITELOADER_VERSION_STATUS_VERSION) #else #define LITELOADER_FILE_VERSION_FLAG 0x00000000L -#define LITELOADER_FILE_VERSION_STRING TO_VERSION_STRING_EXPAND(LITELOADER_VERSION_MAJOR.LITELOADER_VERSION_MINOR.LITELOADER_VERSION_REVISION.LITELOADER_VERSION_ACTIONS) +#define LITELOADER_FILE_VERSION_STRING TO_VERSION_STRING_EXPAND(LITELOADER_VERSION_MAJOR.LITELOADER_VERSION_MINOR.LITELOADER_VERSION_REVISION.LITELOADER_VERSION_ACTIONS.RELEASE.LITELOADER_VERSION_STATUS_VERSION) #endif diff --git a/ScriptEngine/src/res/ScriptEngine.rc b/ScriptEngine/src/res/ScriptEngine.rc index 7e29dc9936..cd5a98efdd 100644 --- a/ScriptEngine/src/res/ScriptEngine.rc +++ b/ScriptEngine/src/res/ScriptEngine.rc @@ -15,7 +15,6 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// ����(���壬�й�) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -94,7 +93,7 @@ BEGIN END END -#endif // ����(���壬�й�) resources +#endif /////////////////////////////////////////////////////////////////////////////