Latest Magnum and STD module support
This commit is contained in:
parent
0f26b7423d
commit
3b8456d07a
2
.idea/EtrediaEmpires.iml
generated
2
.idea/EtrediaEmpires.iml
generated
@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module classpath="CMake" type="CPP_MODULE" version="4" />
|
<module classpath="CIDR" type="CPP_MODULE" version="4" />
|
||||||
345
.idea/editor.xml
generated
Normal file
345
.idea/editor.xml
generated
Normal file
@ -0,0 +1,345 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="BackendCodeEditorSettings">
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CDeclarationWithImplicitIntType/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConstevalIfIsAlwaysConstant/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractClassWithoutSpecifier/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractFinalClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractVirtualFunctionCallInCtor/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAccessSpecifierWithNoDeclarations/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAwaiterTypeIsNotClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBooleanIncrementExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatBadCode/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatLegacyCode/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatMixedArgs/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooFewArgs/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooManyArgs/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCVQualifierCanNotBeAppliedToReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassIsIncomplete/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeedsConstructorBecauseOfUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCompileTimeConstantCanBeReplacedWithBooleanConstant/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConceptNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConditionalExpressionCanBeSimplified/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstParameterInDeclaration/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstValueFunctionReturnType/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCoroutineCallResolveError/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAArrayIndexOutOfBounds/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantConditions/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantFunctionResult/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantParameter/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFADeletedPointer/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAEndlessLoop/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInfiniteRecursion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInvalidatedMemory/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesScope/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALoopConditionNotUpdated/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAMemoryLeak/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANotInitializedField/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANullDereference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFATimeOver/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableCode/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableFunctionCall/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreadVariable/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnusedValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesLocal/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesUncapturedLocal/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationSpecifierWithoutDeclarators/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorDisambiguatedAsFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorUsedBeforeInitialization/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultCaseNotHandledInSwitchStatement/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultInitializationWithNoUserConstructor/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultIsUsedAsIdentifier/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultedSpecialMemberFunctionIsImplicitlyDeleted/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefinitionsOrder/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeletingVoidPointer/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTemplateWithoutTemplateKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTypeWithoutTypenameKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedEntity/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedOverridenMethod/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedRegisterStorageClassSpecifier/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDereferenceOperatorLimitExceeded/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDiscardedPostfixOperatorResult/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenSyntaxError/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUndocumentedParameter/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUnresolvedReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEmptyDeclaration/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersOrder/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersPlacement/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceDoStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceForStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceFunctionDeclarationStyle/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceIfStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceNestedNamespacesStyle/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingDestructorStyle/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingFunctionStyle/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceTypeAliasCodeStyle/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceWhileStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityAssignedButNoRead/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityUsedOnlyInUnevaluatedContext/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnumeratorNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEqualOperandsInBinaryExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEvaluationFailure/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExplicitSpecializationInNonNamespaceScope/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExpressionWithoutSideEffects/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalFunctionInFinalClass/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalNonOverridingVirtualFunction/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForLoopCanBeReplacedWithWhile/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForwardEnumDeclarationWithoutUnderlyingType/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionDoesntReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionIsNotImplemented/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionResultShouldBeUsed/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionalStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHeaderHasBeenAlreadyIncluded/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHiddenFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHidingFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIdenticalOperandsInBinaryExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIfCanBeReplacedByConstexprIf/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppImplicitDefaultConstructorNotAvailable/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompatiblePointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompleteSwitchStatement/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInconsistentNaming/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIntegralToPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInvalidLineContinuation/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppJoinDeclarationAndAssignment/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLambdaCaptureNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMayBeConst/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableWithNonTrivialDtorIsNeverUsed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLongFloat/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeConst/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeStatic/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberInitializersOrder/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMismatchedClassTags/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingIncludeGuard/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingKeywordThrow/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppModulePartitionWithSeveralPartitionUnits/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtAddressOfClassRValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtBindingRValueToLvalueReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtCopyElisionInCopyInitDeclarator/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtDoubleUserConversionInCopyInit/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtNotInitializedStaticConstLocalVar/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtReinterpretCastFromNullptr/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterLiteral/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterWideLiteral/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMustBePublicVirtualToImplementInterface/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMutableSpecifierOnReferenceMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNoDiscardExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNodiscardFunctionWithoutReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExceptionSafeResourceAcquisition/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConversionOperator/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConvertingConstructor/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineFunctionDefinitionInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineVariableDefinitionInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNotAllPathsReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppObjectMemberMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppOutParameterMustBeWritten/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConst/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConstPtrOrRef/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNamesMismatch/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNeverUsed/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPassValueParameterByConstReference/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerConversionDropsQualifiers/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerToIntegralConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPolymorphicClassWithNonVirtualPublicDestructor/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyErroneousEmptyStatements/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUnintendedObjectSlicing/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderIsNotIncluded/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderNotFound/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfBadFormat/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfExtraArg/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfMissedArg/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfRiskyFormat/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrivateSpecialMemberFunctionIsNotImplemented/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRangeBasedForIncompatibleReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedefinitionOfDefaultArgumentInOverrideFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantAccessSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassAccessSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassInitializer/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBooleanExpressionArgument/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantCastExpression/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantComplexityInComparison/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConditionalExpression/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConstSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantControlFlowJump/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantDereferencingAndTakingAddress/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElaboratedTypeSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeyword/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeywordInsideCompoundStatement/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyDeclaration/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyStatement/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantExportKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantFwdClassOrEnumSpecifier/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantInlineSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantLambdaParameterList/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantMemberInitializer/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantNamespaceDefinition/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantParentheses/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantQualifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantQualifierADL/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnMemberAllocationFunction/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnThreadLocalLocalVariable/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateArguments/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTypenameKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantVoidArgumentList/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantZeroInitializerInAggregateInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReinterpretCastFromVoidPtr/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRemoveRedundantBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceMemsetWithZeroInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceTieWithStructuredBinding/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReturnNoValueInNonVoidFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSmartPointerVsMakeFunction/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSomeObjectMembersMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSpecialFunctionWithoutNoexceptSpecification/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticAssertFailure/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticDataMemberInUnnamedStruct/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticSpecifierOnAnonymousNamespaceMember/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStringLiteralToCharPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTabsAreDisallowed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateArgumentsCanBeDeduced/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterNeverUsed/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterShadowing/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppThrowExpressionCanBeReplacedWithRethrow/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScope/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScopeInitStatement/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTypeAliasNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedDependentBaseClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedNonStaticDataMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnionMemberOfReferenceType/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaEndRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnamedNamespaceInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnecessaryWhitespace/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnsignedZeroComparison/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnusedIncludeDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAlgorithmWithCount/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAssociativeContains/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAuto/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAutoForNumeric/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseElementsView/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseEraseAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseFamiliarTemplateSyntaxForGenericLambdas/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseRangeAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStdSize/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStructuredBinding/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseTypeTraitAlias/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUserDefinedLiteralSuffixDoesNotStartWithUnderscore/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUsingResultOfAssignmentAsCondition/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVariableCanBeMadeConstexpr/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionCallInsideCtor/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionInFinalClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVolatileParameterInDeclaration/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWarningDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongIncludesOrder/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongSlashesInIncludeDirective/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroConstantCanBeReplacedWithNullptr/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroValuedExpressionUsedAsNullPointer/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IfStdIsConstantEvaluatedCanBeReplaced/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StdIsConstantEvaluatedWillAlwaysEvaluateToConstant/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppClangFormat/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_ARGUMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXPRESSION/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_FOR_STMT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_PARAMETER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_ARGUMENT/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTILINE_TYPE_PARAMETER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGN_TERNARY/@EntryValue" value="ALIGN_ALL" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_CLASS_DEFINITION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_DECLARATIONS/@EntryValue" value="0" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DECLARATION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BLANK_LINES_AROUND_FUNCTION_DEFINITION/@EntryValue" value="1" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/BREAK_TEMPLATE_DECLARATION/@EntryValue" value="LINE_BREAK" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CASE_BLOCK_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CONTINUOUS_LINE_INDENT/@EntryValue" value="Double" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_ACCESS_SPECIFIERS_FROM_CLASS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CASE_FROM_SWITCH/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_CLASS_MEMBERS_FROM_ACCESS_SPECIFIERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_COMMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_SIZE/@EntryValue" value="4" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_STYLE/@EntryValue" value="Space" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INITIALIZER_BRACES/@EntryValue" value="END_OF_LINE_NO_SPACE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INT_ALIGN_EQ/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INVOCABLE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_CODE/@EntryValue" value="2" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue" value="2" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/KEEP_USER_LINEBREAKS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/LINE_BREAK_AFTER_COLON_IN_MEMBER_INITIALIZER_LISTS/@EntryValue" value="ON_SINGLE_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/MEMBER_INITIALIZER_LIST_STYLE/@EntryValue" value="DO_NOT_CHANGE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_INDENTATION/@EntryValue" value="All" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/OTHER_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_CATCH_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_ELSE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_NAMESPACE_DEFINITIONS_ON_SAME_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/PLACE_WHILE_ON_NEW_LINE/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SIMPLE_BLOCK_STYLE/@EntryValue" value="DO_NOT_CHANGE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_COMMA_IN_TEMPLATE_PARAMS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_FOR_SEMICOLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_METHOD/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_PTR_IN_NESTED_DECLARATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBER/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_DATA_MEMBERS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_REF_IN_METHOD/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_AFTER_UNARY_OPERATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_COLON_IN_BITFIELD_DECLARATOR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_EXTENDS_COLON/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_COLON/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_FOR_SEMICOLON/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_ABSTRACT_DECL/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_PTR_IN_METHOD/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_ABSTRACT_DECL/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBER/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_DATA_MEMBERS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_REF_IN_METHOD/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BEFORE_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_BETWEEN_CLOSING_ANGLE_BRACKETS_IN_TEMPLATE_ARGS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_ARRAY_ACCESS_BRACKETS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_CAST_EXPRESSION_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_DECLARATION_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_BLOCKS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_METHOD_PARENTHESES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_EMPTY_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_INITIALIZER_BRACES/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_ARGS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPACE_WITHIN_TEMPLATE_PARAMS/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/SPECIAL_ELSE_IF_TREATMENT/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TAB_WIDTH/@EntryValue" value="4" type="int" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TYPE_DECLARATION_BRACES/@EntryValue" value="END_OF_LINE" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_BINARY_OPSIGN/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_AFTER_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_ARGUMENTS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_DECLARATION_RPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_LPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_INVOCATION_RPAR/@EntryValue" value="false" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_BEFORE_TERNARY_OPSIGNS/@EntryValue" value="true" type="bool" />
|
||||||
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/WRAP_PARAMETERS_STYLE/@EntryValue" value="WRAP_IF_LONG" type="string" />
|
||||||
|
<option name="/Default/CodeStyle/EditorConfig/EnableClangFormatSupport/@EntryValue" value="false" type="bool" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
17
.idea/inspectionProfiles/Project_Default.xml
generated
17
.idea/inspectionProfiles/Project_Default.xml
generated
@ -1,11 +1,28 @@
|
|||||||
<component name="InspectionProjectProfileManager">
|
<component name="InspectionProjectProfileManager">
|
||||||
<profile version="1.0">
|
<profile version="1.0">
|
||||||
<option name="myName" value="Project Default" />
|
<option name="myName" value="Project Default" />
|
||||||
|
<inspection_tool class="ArrayIndexOutOfBounds" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
<inspection_tool class="ClangTidy" enabled="false" level="WARNING" enabled_by_default="false" />
|
<inspection_tool class="ClangTidy" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="ConstantConditionsOC" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="ConstantFunctionResult" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="ConstantParameter" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="DanglingPointer" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="EndlessLoop" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="InfiniteRecursion" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="LocalValueEscapesScope" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="LoopDoesntUseConditionVariable" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="MemoryLeak" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="NotInitializedField" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="NullDereference" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||||
<option name="processCode" value="true" />
|
<option name="processCode" value="true" />
|
||||||
<option name="processLiterals" value="true" />
|
<option name="processLiterals" value="true" />
|
||||||
<option name="processComments" value="true" />
|
<option name="processComments" value="true" />
|
||||||
</inspection_tool>
|
</inspection_tool>
|
||||||
|
<inspection_tool class="UnreachableCallsOfFunction" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="UnreachableCode" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="UnusedLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="UnusedParameter" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
|
<inspection_tool class="UnusedValue" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||||
</profile>
|
</profile>
|
||||||
</component>
|
</component>
|
||||||
@ -1,9 +1,11 @@
|
|||||||
cmake_minimum_required (VERSION 4.2.3)
|
cmake_minimum_required (VERSION 4.1)
|
||||||
|
|
||||||
|
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "d0edc3af-4c50-42ea-a356-e2862fe7a444")
|
||||||
set(CMAKE_CXX_STANDARD 23)
|
set(CMAKE_CXX_STANDARD 23)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
|
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
|
||||||
set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
|
set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
|
||||||
|
set(CMAKE_CXX_MODULE_STD ON)
|
||||||
|
|
||||||
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||||
|
|||||||
@ -10,7 +10,8 @@
|
|||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "cl.exe",
|
"CMAKE_C_COMPILER": "cl.exe",
|
||||||
"CMAKE_CXX_COMPILER": "cl.exe",
|
"CMAKE_CXX_COMPILER": "cl.exe",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
|
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||||
|
"VCPKG_OVERLAY_PORTS": "${sourceDir}/ports"
|
||||||
},
|
},
|
||||||
"condition": {
|
"condition": {
|
||||||
"type": "equals",
|
"type": "equals",
|
||||||
|
|||||||
@ -1,3 +1,8 @@
|
|||||||
|
#include "Logger.h"
|
||||||
|
#include "compile_config.hpp"
|
||||||
|
#include <GLFW/glfw3.h>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
import utils;
|
import utils;
|
||||||
|
|
||||||
import Engine;
|
import Engine;
|
||||||
@ -5,10 +10,6 @@ import Actions;
|
|||||||
import MagnumRender;
|
import MagnumRender;
|
||||||
import GLFWInput;
|
import GLFWInput;
|
||||||
|
|
||||||
#include "Logger.h"
|
|
||||||
#include "compile_config.hpp"
|
|
||||||
#include <GLFW/glfw3.h>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
IP7_Trace* Logger::trace;
|
IP7_Trace* Logger::trace;
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
|
|||||||
27
ports/corrade/build-corrade-rc-always.patch
Normal file
27
ports/corrade/build-corrade-rc-always.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
--- a/src/Corrade/Utility/CMakeLists.txt
|
||||||
|
+++ b/src/Corrade/Utility/CMakeLists.txt
|
||||||
|
@@ -185,13 +185,12 @@
|
||||||
|
# corrade-rc when generating WinRT targets by setting
|
||||||
|
# set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF)
|
||||||
|
# Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT).
|
||||||
|
# However, it seems like this feature never materialized, as doing this will
|
||||||
|
# result in corrade-rc that's looking for vcruntime140_app.dll in order to be
|
||||||
|
# run. Last checked: Nov 2019.
|
||||||
|
-if(NOT CMAKE_CROSSCOMPILING)
|
||||||
|
# Sources for standalone corrade-rc
|
||||||
|
set(CorradeUtilityRc_SRCS
|
||||||
|
Arguments.cpp
|
||||||
|
Debug.cpp
|
||||||
|
Directory.cpp
|
||||||
|
Configuration.cpp
|
||||||
|
@@ -235,9 +234,10 @@
|
||||||
|
if(CORRADE_TARGET_UNIX)
|
||||||
|
target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS})
|
||||||
|
endif()
|
||||||
|
set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility")
|
||||||
|
install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR})
|
||||||
|
|
||||||
|
+if(NOT CMAKE_CROSSCOMPILING)
|
||||||
|
# Corrade::rc target alias for superprojects
|
||||||
|
add_executable(Corrade::rc ALIAS corrade-rc)
|
||||||
|
endif()
|
||||||
32
ports/corrade/clang-16.patch
Normal file
32
ports/corrade/clang-16.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
diff --git a/src/Corrade/Utility/StlForwardArray.h b/src/Corrade/Utility/StlForwardArray.h
|
||||||
|
index 0e78d61..363fafb 100644
|
||||||
|
--- a/src/Corrade/Utility/StlForwardArray.h
|
||||||
|
+++ b/src/Corrade/Utility/StlForwardArray.h
|
||||||
|
@@ -55,7 +55,11 @@ possible or is unknown is equivalent to @cpp #include <array> @ce.
|
||||||
|
|
||||||
|
#ifdef CORRADE_TARGET_LIBCXX
|
||||||
|
/* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L223 */
|
||||||
|
+#if _LIBCPP_VERSION < 160000
|
||||||
|
#include <__tuple>
|
||||||
|
+#else
|
||||||
|
+#include <__fwd/array.h>
|
||||||
|
+#endif
|
||||||
|
#elif defined(CORRADE_TARGET_DINKUMWARE)
|
||||||
|
/* MSVC has it defined next to std::pair */
|
||||||
|
#include <utility>
|
||||||
|
diff --git a/src/Corrade/Utility/StlForwardTuple.h b/src/Corrade/Utility/StlForwardTuple.h
|
||||||
|
index 5701bc0..3292ec8 100644
|
||||||
|
--- a/src/Corrade/Utility/StlForwardTuple.h
|
||||||
|
+++ b/src/Corrade/Utility/StlForwardTuple.h
|
||||||
|
@@ -55,7 +55,11 @@ is equivalent to @cpp #include <tuple> @ce.
|
||||||
|
|
||||||
|
#ifdef CORRADE_TARGET_LIBCXX
|
||||||
|
/* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L163 */
|
||||||
|
+#if _LIBCPP_VERSION < 160000
|
||||||
|
#include <__tuple>
|
||||||
|
+#else
|
||||||
|
+#include <__fwd/tuple.h>
|
||||||
|
+#endif
|
||||||
|
#elif defined(CORRADE_TARGET_LIBSTDCXX)
|
||||||
|
/* https://github.com/gcc-mirror/gcc/blob/c014d57d57a03e6061a57fa8534e90979567392b/libstdc%2B%2B-v3/include/std/type_traits#L2465-L2466 */
|
||||||
|
#include <type_traits>
|
||||||
13
ports/corrade/fix-vs2019.patch
Normal file
13
ports/corrade/fix-vs2019.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index e0cc288..e5a4648 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -195,7 +195,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||||
|
set(MSVC2017_COMPATIBILITY ON)
|
||||||
|
message(WARNING "MSVC 2017 detected, automatically enabling MSVC2017_COMPATIBILITY. Note that some features may not be available with this compiler.")
|
||||||
|
endif()
|
||||||
|
- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.30")
|
||||||
|
+ elseif(CMAKE_CXX_COMPILER_VERSION GREATER "19.20")
|
||||||
|
if(NOT MSVC2019_COMPATIBILITY)
|
||||||
|
set(MSVC2019_COMPATIBILITY ON)
|
||||||
|
message(WARNING "MSVC 2019 detected, automatically enabling MSVC2019_COMPATIBILITY. Note that some features may not be available with this compiler.")
|
||||||
76
ports/corrade/portfile.cmake
Normal file
76
ports/corrade/portfile.cmake
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
vcpkg_from_github(
|
||||||
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
|
REPO mosra/corrade
|
||||||
|
REF 2b7251d
|
||||||
|
SHA512 46497fd8f7a883047e402d4f737d5e34fdd296c342359ba24ef4d5d95f7b3de6f137fda3c8b2181f8baa65ff536aeea98177b9b1323396eb048cace4d82fe908
|
||||||
|
HEAD_REF master
|
||||||
|
)
|
||||||
|
|
||||||
|
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||||
|
|
||||||
|
# Handle features
|
||||||
|
set(_COMPONENTS "")
|
||||||
|
foreach(_feature IN LISTS ALL_FEATURES)
|
||||||
|
# Uppercase the feature name and replace "-" with "_"
|
||||||
|
string(TOUPPER "${_feature}" _FEATURE)
|
||||||
|
string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
|
||||||
|
|
||||||
|
# Final feature is empty, ignore it
|
||||||
|
if(_feature AND NOT "${_feature}" STREQUAL "dynamic-pluginmanager")
|
||||||
|
list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
|
||||||
|
|
||||||
|
set(corrade_rc_param "")
|
||||||
|
if(VCPKG_CROSSCOMPILING)
|
||||||
|
set(corrade_rc_param
|
||||||
|
"-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
vcpkg_cmake_configure(
|
||||||
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
|
OPTIONS
|
||||||
|
${FEATURE_OPTIONS}
|
||||||
|
"${corrade_rc_param}"
|
||||||
|
-DUTILITY_USE_ANSI_COLORS=ON
|
||||||
|
-DBUILD_STATIC=${BUILD_STATIC}
|
||||||
|
MAYBE_UNUSED_VARIABLES
|
||||||
|
CORRADE_RC_EXECUTABLE
|
||||||
|
UTILITY_USE_ANSI_COLORS
|
||||||
|
)
|
||||||
|
|
||||||
|
vcpkg_cmake_install()
|
||||||
|
|
||||||
|
# Debug includes and share are the same as release
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
|
|
||||||
|
# corrade-rc is not built when CMAKE_CROSSCOMPILING
|
||||||
|
vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN)
|
||||||
|
|
||||||
|
# Ensure no empty folders are left behind
|
||||||
|
if(FEATURES STREQUAL "core")
|
||||||
|
# No features, no libs (only Corrade.h).
|
||||||
|
file(REMOVE_RECURSE
|
||||||
|
"${CURRENT_PACKAGES_DIR}/bin"
|
||||||
|
"${CURRENT_PACKAGES_DIR}/lib"
|
||||||
|
"${CURRENT_PACKAGES_DIR}/debug")
|
||||||
|
# debug is completely empty, as include and share
|
||||||
|
# have already been removed.
|
||||||
|
|
||||||
|
elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||||
|
# No dlls
|
||||||
|
file(REMOVE_RECURSE
|
||||||
|
"${CURRENT_PACKAGES_DIR}/bin"
|
||||||
|
"${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Handle copyright
|
||||||
|
file(INSTALL "${SOURCE_PATH}/COPYING"
|
||||||
|
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
||||||
|
RENAME copyright)
|
||||||
|
|
||||||
|
vcpkg_copy_pdbs()
|
||||||
86
ports/corrade/vcpkg.json
Normal file
86
ports/corrade/vcpkg.json
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"version-string": "2020.06",
|
||||||
|
"port-version": 8,
|
||||||
|
"description": "C++11/C++14 multiplatform utility library.",
|
||||||
|
"homepage": "https://magnum.graphics/corrade/",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"host": true,
|
||||||
|
"default-features": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake",
|
||||||
|
"host": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake-config",
|
||||||
|
"host": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"default-features": [
|
||||||
|
"interconnect",
|
||||||
|
"pluginmanager",
|
||||||
|
"testsuite",
|
||||||
|
"utility"
|
||||||
|
],
|
||||||
|
"features": {
|
||||||
|
"dynamic-pluginmanager": {
|
||||||
|
"description": "PluginManager library with dynamic plugin support",
|
||||||
|
"supports": "!ios & !uwp & !android",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"pluginmanager"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"interconnect": {
|
||||||
|
"description": "Interconnect library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"utility"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"pluginmanager": {
|
||||||
|
"description": "PluginManager library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
{
|
||||||
|
"name": "dynamic-pluginmanager",
|
||||||
|
"platform": "!ios & !uwp & !android"
|
||||||
|
},
|
||||||
|
"utility"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"testsuite": {
|
||||||
|
"description": "TestSuite library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"utility"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"utility": {
|
||||||
|
"description": "Utility library"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
43
ports/magnum/002-sdl-includes.patch
Normal file
43
ports/magnum/002-sdl-includes.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
diff --git a/src/Magnum/Platform/Sdl2Application.cpp b/src/Magnum/Platform/Sdl2Application.cpp
|
||||||
|
index 276c7ee55..90c52f3cb 100644
|
||||||
|
--- a/src/Magnum/Platform/Sdl2Application.cpp
|
||||||
|
+++ b/src/Magnum/Platform/Sdl2Application.cpp
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wpragma-pack"
|
||||||
|
#endif
|
||||||
|
-#include <SDL.h>
|
||||||
|
+#include <SDL2/SDL.h>
|
||||||
|
#ifdef CORRADE_TARGET_CLANG_CL
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
#endif
|
||||||
|
diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
|
||||||
|
index b2426d513..176729fdb 100644
|
||||||
|
--- a/src/Magnum/Platform/Sdl2Application.h
|
||||||
|
+++ b/src/Magnum/Platform/Sdl2Application.h
|
||||||
|
@@ -57,11 +57,11 @@
|
||||||
|
#pragma clang diagnostic ignored "-Wpragma-pack"
|
||||||
|
#endif
|
||||||
|
/* SDL.h includes the world, adding 50k LOC. We don't want that either. */
|
||||||
|
-#include <SDL_keycode.h>
|
||||||
|
-#include <SDL_mouse.h>
|
||||||
|
-#include <SDL_version.h> /* huh, why is this not pulled in implicitly?! */
|
||||||
|
-#include <SDL_video.h>
|
||||||
|
-#include <SDL_scancode.h>
|
||||||
|
+#include <SDL2/SDL_keycode.h>
|
||||||
|
+#include <SDL2/SDL_mouse.h>
|
||||||
|
+#include <SDL2/SDL_version.h> /* huh, why is this not pulled in implicitly?! */
|
||||||
|
+#include <SDL2/SDL_video.h>
|
||||||
|
+#include <SDL2/SDL_scancode.h>
|
||||||
|
|
||||||
|
#ifdef CORRADE_TARGET_IOS
|
||||||
|
/* Including SDL_main.h unconditionally would mean it'd override Corrade::Main
|
||||||
|
@@ -74,7 +74,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CORRADE_TARGET_WINDOWS_RT
|
||||||
|
-#include <SDL_main.h> /* For SDL_WinRTRunApp */
|
||||||
|
+#include <SDL2/SDL_main.h> /* For SDL_WinRTRunApp */
|
||||||
|
#include <wrl.h> /* For the WinMain entrypoint */
|
||||||
|
#endif
|
||||||
|
#ifdef CORRADE_TARGET_CLANG_CL
|
||||||
16
ports/magnum/003-fix-FindGLFW.patch
Normal file
16
ports/magnum/003-fix-FindGLFW.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
|
||||||
|
index 8761448..17321af 100644
|
||||||
|
--- a/modules/FindMagnum.cmake
|
||||||
|
+++ b/modules/FindMagnum.cmake
|
||||||
|
@@ -647,9 +647,9 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
|
||||||
|
|
||||||
|
# GLFW application dependencies
|
||||||
|
elseif(_component STREQUAL GlfwApplication)
|
||||||
|
- find_package(GLFW)
|
||||||
|
+ find_package(glfw3 CONFIG REQUIRED)
|
||||||
|
set_property(TARGET Magnum::${_component} APPEND PROPERTY
|
||||||
|
- INTERFACE_LINK_LIBRARIES GLFW::GLFW)
|
||||||
|
+ INTERFACE_LINK_LIBRARIES glfw)
|
||||||
|
# Use the Foundation framework on Apple to query the DPI awareness
|
||||||
|
if(CORRADE_TARGET_APPLE)
|
||||||
|
find_library(_MAGNUM_APPLE_FOUNDATION_FRAMEWORK_LIBRARY Foundation)
|
||||||
25
ports/magnum/004-fix-FindOpenAL.patch
Normal file
25
ports/magnum/004-fix-FindOpenAL.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
diff --git a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt
|
||||||
|
index 64371a4..375ca58 100644
|
||||||
|
--- a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt
|
||||||
|
+++ b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
find_package(Corrade REQUIRED PluginManager)
|
||||||
|
+find_package(OpenAL CONFIG REQUIRED)
|
||||||
|
|
||||||
|
if(BUILD_PLUGINS_STATIC)
|
||||||
|
set(MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC 1)
|
||||||
|
diff --git a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
|
||||||
|
index f4172d4..bdfd9da 100644
|
||||||
|
--- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
|
||||||
|
+++ b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
|
||||||
|
@@ -24,6 +24,8 @@
|
||||||
|
#
|
||||||
|
|
||||||
|
find_package(Corrade REQUIRED PluginManager)
|
||||||
|
+include(CMakeFindDependencyMacro)
|
||||||
|
+find_dependency(OpenAL)
|
||||||
|
|
||||||
|
if(BUILD_PLUGINS_STATIC)
|
||||||
|
set(MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC 1)
|
||||||
13
ports/magnum/005-fix-find-sdl2.patch
Normal file
13
ports/magnum/005-fix-find-sdl2.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt
|
||||||
|
index f1b404f..19babf4 100644
|
||||||
|
--- a/src/Magnum/Platform/CMakeLists.txt
|
||||||
|
+++ b/src/Magnum/Platform/CMakeLists.txt
|
||||||
|
@@ -292,7 +292,7 @@ endif()
|
||||||
|
|
||||||
|
# SDL2 application
|
||||||
|
if(WITH_SDL2APPLICATION)
|
||||||
|
- find_package(SDL2)
|
||||||
|
+ find_package(SDL2 CONFIG REQUIRED)
|
||||||
|
if(NOT SDL2_FOUND)
|
||||||
|
message(FATAL_ERROR "SDL2 library, required by Sdl2Application, was not found. Set WITH_SDL2APPLICATION to OFF to skip building it.")
|
||||||
|
endif()
|
||||||
70
ports/magnum/006-fix-build.patch
Normal file
70
ports/magnum/006-fix-build.patch
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
diff --git a/src/Magnum/Vk/Enums.cpp b/src/Magnum/Vk/Enums.cpp
|
||||||
|
index ad8b6d063..b7dffb74f 100644
|
||||||
|
--- a/src/Magnum/Vk/Enums.cpp
|
||||||
|
+++ b/src/Magnum/Vk/Enums.cpp
|
||||||
|
@@ -36,17 +36,17 @@ namespace Magnum { namespace Vk {
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
-constexpr VkPrimitiveTopology PrimitiveTopologyMapping[]{
|
||||||
|
+constexpr UnsignedInt PrimitiveTopologyMapping[]{
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_POINT_LIST,
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_LINE_LIST,
|
||||||
|
- VkPrimitiveTopology(~UnsignedInt{}),
|
||||||
|
+ ~UnsignedInt{},
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_LINE_STRIP,
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP,
|
||||||
|
VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN,
|
||||||
|
- VkPrimitiveTopology(~UnsignedInt{}), /* Instances */
|
||||||
|
- VkPrimitiveTopology(~UnsignedInt{}), /* Faces */
|
||||||
|
- VkPrimitiveTopology(~UnsignedInt{}) /* Edges */
|
||||||
|
+ ~UnsignedInt{}, /* Instances */
|
||||||
|
+ ~UnsignedInt{}, /* Faces */
|
||||||
|
+ ~UnsignedInt{} /* Edges */
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr VkIndexType IndexTypeMapping[]{
|
||||||
|
@@ -94,12 +94,12 @@ constexpr VkSamplerMipmapMode SamplerMipmapModeMapping[]{
|
||||||
|
VK_SAMPLER_MIPMAP_MODE_LINEAR
|
||||||
|
};
|
||||||
|
|
||||||
|
-constexpr VkSamplerAddressMode SamplerAddressModeMapping[]{
|
||||||
|
+constexpr UnsignedInt SamplerAddressModeMapping[]{
|
||||||
|
VK_SAMPLER_ADDRESS_MODE_REPEAT,
|
||||||
|
VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT,
|
||||||
|
VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
|
||||||
|
VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
|
||||||
|
- VkSamplerAddressMode(~UnsignedInt{}),
|
||||||
|
+ ~UnsignedInt{},
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
@@ -119,10 +119,10 @@ VkPrimitiveTopology vkPrimitiveTopology(const Magnum::MeshPrimitive primitive) {
|
||||||
|
|
||||||
|
CORRADE_ASSERT(UnsignedInt(primitive) - 1 < Containers::arraySize(PrimitiveTopologyMapping),
|
||||||
|
"Vk::vkPrimitiveTopology(): invalid primitive" << primitive, {});
|
||||||
|
- const VkPrimitiveTopology out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1];
|
||||||
|
- CORRADE_ASSERT(out != VkPrimitiveTopology(~UnsignedInt{}),
|
||||||
|
+ const UnsignedInt out = PrimitiveTopologyMapping[UnsignedInt(primitive) - 1];
|
||||||
|
+ CORRADE_ASSERT(out != ~UnsignedInt{},
|
||||||
|
"Vk::vkPrimitiveTopology(): unsupported primitive" << primitive, {});
|
||||||
|
- return out;
|
||||||
|
+ return VkPrimitiveTopology(out);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool hasVkIndexType(const Magnum::MeshIndexType type) {
|
||||||
|
@@ -224,10 +224,10 @@ bool hasVkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) {
|
||||||
|
VkSamplerAddressMode vkSamplerAddressMode(const Magnum::SamplerWrapping wrapping) {
|
||||||
|
CORRADE_ASSERT(UnsignedInt(wrapping) < Containers::arraySize(SamplerAddressModeMapping),
|
||||||
|
"Vk::vkSamplerAddressMode(): invalid wrapping" << wrapping, {});
|
||||||
|
- const VkSamplerAddressMode out = SamplerAddressModeMapping[UnsignedInt(wrapping)];
|
||||||
|
- CORRADE_ASSERT(out != VkSamplerAddressMode(~UnsignedInt{}),
|
||||||
|
+ const UnsignedInt out = SamplerAddressModeMapping[UnsignedInt(wrapping)];
|
||||||
|
+ CORRADE_ASSERT(out != ~UnsignedInt{},
|
||||||
|
"Vk::vkSamplerAddressMode(): unsupported wrapping" << wrapping, {});
|
||||||
|
- return out;
|
||||||
|
+ return VkSamplerAddressMode(out);
|
||||||
|
}
|
||||||
|
|
||||||
|
}}
|
||||||
40
ports/magnum/magnumdeploy.ps1
Normal file
40
ports/magnum/magnumdeploy.ps1
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
# Magnum's plugin deployment strategy is that each Magnum module has a hardcoded
|
||||||
|
# set of plugin directories. Each of these directories is deployed in
|
||||||
|
# full if that Module is referenced.
|
||||||
|
#
|
||||||
|
# Note: this function signature and behavior is depended upon by applocal.ps1
|
||||||
|
function deployPluginsIfMagnum([string]$targetBinaryDir, [string]$MagnumPluginsDir, [string]$targetBinaryName) {
|
||||||
|
Write-Verbose "Deploying magnum plugins"
|
||||||
|
|
||||||
|
$baseDir = Split-Path $MagnumPluginsDir -parent
|
||||||
|
$pluginsBase = Split-Path $MagnumPluginsDir -Leaf
|
||||||
|
$binDir = "$baseDir\bin"
|
||||||
|
|
||||||
|
function deployPlugins([string]$pluginSubdirName) {
|
||||||
|
if (Test-Path "$MagnumPluginsDir\$pluginSubdirName") {
|
||||||
|
Write-Verbose " Deploying plugins directory '$pluginSubdirName'"
|
||||||
|
New-Item "$targetBinaryDir\$pluginsBase\$pluginSubdirName" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
|
||||||
|
Get-ChildItem -Path "$MagnumPluginsDir\$pluginSubdirName\*" -Include "*.dll", "*.conf", "*.pdb" | % {
|
||||||
|
deployBinary "$targetBinaryDir\$pluginsBase\$pluginSubdirName" "$MagnumPluginsDir\$pluginSubdirName" $_.Name
|
||||||
|
resolve $_
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Write-Verbose " Skipping plugins directory '$pluginSubdirName': doesn't exist"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# We detect Magnum modules in use via the DLLs that contain their
|
||||||
|
# plugin interfaces.
|
||||||
|
if ($targetBinaryName -like "MagnumAudio.dll" -or $targetBinaryName -like "MagnumAudio-d.dll") {
|
||||||
|
deployPlugins "audioimporters"
|
||||||
|
} elseif ($targetBinaryName -like "MagnumText.dll" -or $targetBinaryName -like "MagnumText-d.dll") {
|
||||||
|
deployPlugins "fonts"
|
||||||
|
deployPlugins "fontconverters"
|
||||||
|
} elseif ($targetBinaryName -like "MagnumTrade.dll" -or $targetBinaryName -like "MagnumTrade-d.dll") {
|
||||||
|
deployPlugins "importers"
|
||||||
|
deployPlugins "imageconverters"
|
||||||
|
deployPlugins "sceneconverters"
|
||||||
|
} elseif ($targetBinaryName -like "MagnumShaderTools.dll" -or $targetBinaryName -like "MagnumShaderTools-d.dll") {
|
||||||
|
deployPlugins "shaderconverters"
|
||||||
|
}
|
||||||
|
}
|
||||||
162
ports/magnum/portfile.cmake
Normal file
162
ports/magnum/portfile.cmake
Normal file
@ -0,0 +1,162 @@
|
|||||||
|
vcpkg_from_github(
|
||||||
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
|
REPO mosra/magnum
|
||||||
|
REF b4d621c
|
||||||
|
SHA512 0e5be3e41bf18391979f47f9bcf9b1253a1918a3232ebd3c4cca93305de34cafb5aa58ab72dd1ba623a42a87fb7f4b2e1789ada59cb250c6396e40c508c4a2a5
|
||||||
|
HEAD_REF master
|
||||||
|
)
|
||||||
|
|
||||||
|
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||||
|
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_PLUGINS_STATIC)
|
||||||
|
|
||||||
|
set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES})
|
||||||
|
|
||||||
|
# Head only features
|
||||||
|
if(NOT VCPKG_USE_HEAD_VERSION)
|
||||||
|
foreach(_feature anyshaderconverter shadertools shaderconverter vk-info)
|
||||||
|
if("${_feature}" IN_LIST FEATURES)
|
||||||
|
message(FATAL_ERROR "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter vk-info)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(_COMPONENTS "")
|
||||||
|
# Generate cmake parameters from feature names
|
||||||
|
foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES)
|
||||||
|
# Uppercase the feature name and replace "-" with "_"
|
||||||
|
string(TOUPPER "${_feature}" _FEATURE)
|
||||||
|
string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
|
||||||
|
|
||||||
|
# Final feature is empty, ignore it
|
||||||
|
if(_feature)
|
||||||
|
list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
|
||||||
|
|
||||||
|
if(VCPKG_CROSSCOMPILING)
|
||||||
|
set(CORRADE_RC_EXECUTABLE "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
vcpkg_cmake_configure(
|
||||||
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
|
OPTIONS
|
||||||
|
${FEATURE_OPTIONS}
|
||||||
|
${CORRADE_RC_EXECUTABLE}
|
||||||
|
-DBUILD_STATIC=${BUILD_STATIC}
|
||||||
|
-DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
|
||||||
|
-DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
|
||||||
|
-DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum
|
||||||
|
)
|
||||||
|
|
||||||
|
vcpkg_cmake_install()
|
||||||
|
|
||||||
|
vcpkg_copy_pdbs()
|
||||||
|
|
||||||
|
# Copy tools into vcpkg's tools directory
|
||||||
|
set(_TOOL_EXEC_NAMES "")
|
||||||
|
set(_TOOLS
|
||||||
|
al-info
|
||||||
|
distancefieldconverter
|
||||||
|
fontconverter
|
||||||
|
gl-info
|
||||||
|
imageconverter
|
||||||
|
sceneconverter)
|
||||||
|
if(VCPKG_USE_HEAD_VERSION)
|
||||||
|
list(APPEND _TOOLS shaderconverter vk-info)
|
||||||
|
endif()
|
||||||
|
foreach(_tool IN LISTS _TOOLS)
|
||||||
|
if("${_tool}" IN_LIST FEATURES)
|
||||||
|
list(APPEND _TOOL_EXEC_NAMES magnum-${_tool})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
message(STATUS ${_TOOL_EXEC_NAMES})
|
||||||
|
if(_TOOL_EXEC_NAMES)
|
||||||
|
vcpkg_copy_tools(TOOL_NAMES ${_TOOL_EXEC_NAMES} AUTO_CLEAN)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
|
|
||||||
|
# Special handling for plugins.
|
||||||
|
#
|
||||||
|
# For static plugins, in order to make MSBuild auto-linking magic work, where
|
||||||
|
# the linker implicitly takes everything from the root lib/ folder, the
|
||||||
|
# static libraries have to be moved out of lib/magnum/blah/ directly to lib/.
|
||||||
|
# Possibly would be enough to do this just for Windows, doing it also on other
|
||||||
|
# platforms for consistency.
|
||||||
|
#
|
||||||
|
# For dynamic plugins, auto-linking is not desirable as those are meant to be
|
||||||
|
# loaded dynamically at runtime instead. In order to prevent that, on Windows
|
||||||
|
# the *.lib files corresponding to the plugin *.dlls are removed. However, we
|
||||||
|
# cannot remove the *.lib files entirely here, as plugins from magnum-plugins
|
||||||
|
# are linked to them on Windows (e.g. AssimpImporter depends on
|
||||||
|
# AnyImageImporter). Thus the Any* plugin lib files are kept, but also not
|
||||||
|
# moved to the root lib/ folder, to prevent autolinking. A consequence of the
|
||||||
|
# *.lib file removal is that downstream projects can't implement Magnum plugins
|
||||||
|
# that would depend on (and thus link to) these, but that's considered a very
|
||||||
|
# rare use case and so it's fine.
|
||||||
|
#
|
||||||
|
# See https://github.com/microsoft/vcpkg/pull/1235#issuecomment-308805989 for
|
||||||
|
# futher info.
|
||||||
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||||
|
# move plugin libs to conventional place
|
||||||
|
file(GLOB_RECURSE LIB_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*")
|
||||||
|
file(COPY ${LIB_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum")
|
||||||
|
|
||||||
|
file(GLOB_RECURSE LIB_TO_MOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*")
|
||||||
|
file(COPY ${LIB_TO_MOVE_DBG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum")
|
||||||
|
else()
|
||||||
|
if(VCPKG_TARGET_IS_WINDOWS)
|
||||||
|
file(GLOB_RECURSE LIB_TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/magnum/*")
|
||||||
|
file(GLOB_RECURSE LIB_TO_KEEP "${CURRENT_PACKAGES_DIR}/lib/magnum/*Any*")
|
||||||
|
if(LIB_TO_KEEP)
|
||||||
|
list(REMOVE_ITEM LIB_TO_REMOVE ${LIB_TO_KEEP})
|
||||||
|
endif()
|
||||||
|
if(LIB_TO_REMOVE)
|
||||||
|
file(REMOVE ${LIB_TO_REMOVE})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (VCPKG_TARGET_IS_UWP)
|
||||||
|
set(debug_dir "magnum")
|
||||||
|
else()
|
||||||
|
set(debug_dir "magnum-d")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*")
|
||||||
|
file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*Any*")
|
||||||
|
if(LIB_TO_KEEP_DBG)
|
||||||
|
list(REMOVE_ITEM LIB_TO_REMOVE_DBG ${LIB_TO_KEEP_DBG})
|
||||||
|
endif()
|
||||||
|
if(LIB_TO_REMOVE_DBG)
|
||||||
|
file(REMOVE ${LIB_TO_REMOVE_DBG})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# remove maybe empty dirs
|
||||||
|
foreach(subdir "fonts" "importers" "fontconverters" "imageconverters" "audioimporters")
|
||||||
|
file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}/*")
|
||||||
|
if(maybe_empty STREQUAL "")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/${subdir}")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/*")
|
||||||
|
if(maybe_empty STREQUAL "")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum")
|
||||||
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
|
file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum")
|
||||||
|
file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/${debug_dir}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||||
560
ports/magnum/vcpkg.json
Normal file
560
ports/magnum/vcpkg.json
Normal file
@ -0,0 +1,560 @@
|
|||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"version-string": "2020.06",
|
||||||
|
"port-version": 19,
|
||||||
|
"description": "C++11/C++14 graphics middleware for games and data visualization",
|
||||||
|
"homepage": "https://magnum.graphics/",
|
||||||
|
"license": null,
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"host": true,
|
||||||
|
"features": [
|
||||||
|
"utility"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"features": [
|
||||||
|
"utility"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "vcpkg-cmake",
|
||||||
|
"host": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"default-features": [
|
||||||
|
"anyaudioimporter",
|
||||||
|
"anyimageconverter",
|
||||||
|
"anyimageimporter",
|
||||||
|
"anysceneconverter",
|
||||||
|
"anysceneimporter",
|
||||||
|
"debugtools",
|
||||||
|
"gl",
|
||||||
|
"meshtools",
|
||||||
|
"primitives",
|
||||||
|
"scenegraph",
|
||||||
|
"sdl2application",
|
||||||
|
"shaders",
|
||||||
|
"text",
|
||||||
|
"texturetools",
|
||||||
|
"trade"
|
||||||
|
],
|
||||||
|
"features": {
|
||||||
|
"al-info": {
|
||||||
|
"description": "magnum-al-info utility",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"audio"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"anyaudioimporter": {
|
||||||
|
"description": "AnyAudioImporter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"pluginmanager"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"audio"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"anyimageconverter": {
|
||||||
|
"description": "AnyImageConverter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"anyimageimporter": {
|
||||||
|
"description": "AnyImageImporter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"anysceneconverter": {
|
||||||
|
"description": "AnySceneConverter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"anysceneimporter": {
|
||||||
|
"description": "AnySceneImporter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"anyshaderconverter": {
|
||||||
|
"description": "AnyShaderConverter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"shadertools"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"audio": {
|
||||||
|
"description": "Audio library",
|
||||||
|
"dependencies": [
|
||||||
|
"openal-soft"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"cglcontext": {
|
||||||
|
"description": "CglContext library",
|
||||||
|
"supports": "osx",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"debugtools": {
|
||||||
|
"description": "DebugTools library"
|
||||||
|
},
|
||||||
|
"distancefieldconverter": {
|
||||||
|
"description": "magnum-distancefieldconverter utility",
|
||||||
|
"supports": "!ios & !android",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl",
|
||||||
|
"texturetools",
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"eglcontext": {
|
||||||
|
"description": "EglContext library",
|
||||||
|
"supports": "!windows & !osx",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"fontconverter": {
|
||||||
|
"description": "magnum-fontconverter utility",
|
||||||
|
"supports": "!ios & !android",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl",
|
||||||
|
"text",
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"gl": {
|
||||||
|
"description": "GL library",
|
||||||
|
"supports": "!uwp"
|
||||||
|
},
|
||||||
|
"gl-info": {
|
||||||
|
"description": "gl-info utility",
|
||||||
|
"supports": "!ios",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"glfwapplication": {
|
||||||
|
"description": "GlfwApplication library",
|
||||||
|
"dependencies": [
|
||||||
|
"glfw3"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"glxcontext": {
|
||||||
|
"description": "GlxContext library",
|
||||||
|
"supports": "!windows & !osx",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"imageconverter": {
|
||||||
|
"description": "magnum-imageconverter utility",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"dynamic-pluginmanager"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"magnumfont": {
|
||||||
|
"description": "MagnumFont plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"text"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"magnumfontconverter": {
|
||||||
|
"description": "MagnumFontConverter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"text"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"tgaimageconverter"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"meshtools": {
|
||||||
|
"description": "MeshTools library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"objimporter": {
|
||||||
|
"description": "ObjImporter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"opengltester": {
|
||||||
|
"description": "OpenGLTester library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"testsuite"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"primitives": {
|
||||||
|
"description": "Primitives library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"meshtools",
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"sceneconverter": {
|
||||||
|
"description": "magnum-sceneconverter utility",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"dynamic-pluginmanager"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"anysceneconverter"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"scenegraph": {
|
||||||
|
"description": "SceneGraph library"
|
||||||
|
},
|
||||||
|
"sdl2application": {
|
||||||
|
"description": "Sdl2Application library",
|
||||||
|
"dependencies": [
|
||||||
|
"sdl2"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"shaderconverter": {
|
||||||
|
"description": "magnum-shaderconverter utility",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"anyshaderconverter",
|
||||||
|
"shadertools"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"shaders": {
|
||||||
|
"description": "Shaders library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"shadertools": {
|
||||||
|
"description": "ShaderTools library"
|
||||||
|
},
|
||||||
|
"text": {
|
||||||
|
"description": "Text library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"pluginmanager"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"texturetools"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"texturetools": {
|
||||||
|
"description": "TextureTools library"
|
||||||
|
},
|
||||||
|
"tgaimageconverter": {
|
||||||
|
"description": "TgaImageConverter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"tgaimporter": {
|
||||||
|
"description": "TgaImporter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"trade"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"trade": {
|
||||||
|
"description": "Trade library",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"pluginmanager"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"vk": {
|
||||||
|
"description": "Vk library",
|
||||||
|
"dependencies": [
|
||||||
|
"vulkan"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"vk-info": {
|
||||||
|
"description": "vk-info utility",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"vk"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"wavaudioimporter": {
|
||||||
|
"description": "WavAudioImporter plugin",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"audio"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"wglcontext": {
|
||||||
|
"description": "WglContext library",
|
||||||
|
"supports": "windows & !uwp",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"windowlesscglapplication": {
|
||||||
|
"description": "WindowlessCglApplication library",
|
||||||
|
"supports": "osx",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"windowlesseglapplication": {
|
||||||
|
"description": "WindowlessEglApplication library",
|
||||||
|
"supports": "!windows & !osx & !ios",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"windowlessglxapplication": {
|
||||||
|
"description": "WindowlessGlxApplication library",
|
||||||
|
"supports": "!windows & !osx & !ios",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"windowlesswglapplication": {
|
||||||
|
"description": "WindowlessWglApplication library",
|
||||||
|
"supports": "windows & !uwp",
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"default-features": false,
|
||||||
|
"features": [
|
||||||
|
"gl"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -9,7 +9,7 @@ module;
|
|||||||
#include <Magnum/GL/Buffer.h>
|
#include <Magnum/GL/Buffer.h>
|
||||||
#include <Magnum/GL/DefaultFramebuffer.h>
|
#include <Magnum/GL/DefaultFramebuffer.h>
|
||||||
#include <Magnum/Math/Color.h>
|
#include <Magnum/Math/Color.h>
|
||||||
#include <Magnum/Shaders/VertexColor.h>
|
#include <Magnum/Shaders/VertexColorGL.h>
|
||||||
#include <Corrade/Utility/Debug.h>
|
#include <Corrade/Utility/Debug.h>
|
||||||
|
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
@ -17,6 +17,7 @@ module;
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <glm/gtc/type_ptr.hpp>
|
#include <glm/gtc/type_ptr.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
module MagnumRender;
|
module MagnumRender;
|
||||||
import utils;
|
import utils;
|
||||||
@ -98,10 +99,13 @@ void ee_magnum::MagnumRenderer::LoadProvinces()
|
|||||||
{
|
{
|
||||||
GL::Mesh regionMesh;
|
GL::Mesh regionMesh;
|
||||||
|
|
||||||
|
Containers::ArrayView provinceVertices(province.vertices.data(), province.vertices.size());
|
||||||
|
Containers::ArrayView provinceIndices(province.indices.data(), province.indices.size());
|
||||||
|
|
||||||
regionMesh.setPrimitive(GL::MeshPrimitive::Triangles)
|
regionMesh.setPrimitive(GL::MeshPrimitive::Triangles)
|
||||||
.setCount(static_cast<Magnum::Int>(province.indices.size()))
|
.setCount(static_cast<Magnum::Int>(province.indices.size()))
|
||||||
.addVertexBuffer(GL::Buffer{province.vertices}, 0, GL::Attribute<0, Magnum::Vector2>{})
|
.addVertexBuffer(GL::Buffer{provinceVertices}, 0, GL::Attribute<0, Magnum::Vector2>{})
|
||||||
.setIndexBuffer(GL::Buffer{province.indices}, 0, GL::MeshIndexType::UnsignedShort);
|
.setIndexBuffer(GL::Buffer{provinceIndices}, 0, GL::MeshIndexType::UnsignedShort);
|
||||||
|
|
||||||
provinceMeshes.push_back(std::move(regionMesh));
|
provinceMeshes.push_back(std::move(regionMesh));
|
||||||
|
|
||||||
@ -120,14 +124,16 @@ void ee_magnum::MagnumRenderer::LoadProvinces()
|
|||||||
LOG(INFO, "Registered %d province meshes in renderer", provinceMeshes.size());
|
LOG(INFO, "Registered %d province meshes in renderer", provinceMeshes.size());
|
||||||
|
|
||||||
provinceSSBO.setTargetHint(GL::Buffer::TargetHint::ShaderStorage);
|
provinceSSBO.setTargetHint(GL::Buffer::TargetHint::ShaderStorage);
|
||||||
provinceSSBO.setData(provincesData, GL::BufferUsage::DynamicDraw);
|
Containers::ArrayView provincesDataView(provincesData.data(), provincesData.size());
|
||||||
|
provinceSSBO.setData(provincesDataView, GL::BufferUsage::DynamicDraw);
|
||||||
provinceSSBO.bind(GL::Buffer::Target::ShaderStorage, ProvinceMaterial::PROVINCES_DATA_BINDING);
|
provinceSSBO.bind(GL::Buffer::Target::ShaderStorage, ProvinceMaterial::PROVINCES_DATA_BINDING);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ee_magnum::MagnumRenderer::UpdateProvinces(const std::size_t index, const std::vector<ee_engine::ProvinceSSBO> &data)
|
void ee_magnum::MagnumRenderer::UpdateProvinces(const std::size_t index, const std::vector<ee_engine::ProvinceSSBO> &data)
|
||||||
{
|
{
|
||||||
provinceSSBO.setSubData(index, data);
|
Containers::ArrayView provincesData(data.data(), data.size());
|
||||||
|
provinceSSBO.setSubData(index, provincesData);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ee_magnum::MagnumRenderer::Shutdown()
|
void ee_magnum::MagnumRenderer::Shutdown()
|
||||||
|
|||||||
10
vcpkg.json
10
vcpkg.json
@ -7,7 +7,15 @@
|
|||||||
"vulkan",
|
"vulkan",
|
||||||
"glfw3",
|
"glfw3",
|
||||||
"glm",
|
"glm",
|
||||||
{"name": "magnum", "features": ["glfwapplication"]},
|
{
|
||||||
|
"name": "magnum",
|
||||||
|
"features": ["glfwapplication"],
|
||||||
|
"version>=": "0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "corrade",
|
||||||
|
"version>=": "0"
|
||||||
|
},
|
||||||
"rmlui",
|
"rmlui",
|
||||||
"gtest"
|
"gtest"
|
||||||
]
|
]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user