Skip to content

Commit 9cb2dbe

Browse files
IhateTrainsIhateTrains
authored
Updated submodules, fixed Debug config (#154)
* Fix Debug config * Update submodules * Removed registerMatcher calls * Update ImperatorToCK3.vcxproj * Fix Release config
1 parent a6895fa commit 9cb2dbe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+77
-78
lines changed

‎Fronter

‎ImperatorToCK3/ImperatorToCK3.vcxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<TargetName>ImperatorToCK3Converter</TargetName>
7878
<PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
7979
<CodeAnalysisRuleSet>NativeMinimumRules.ruleset</CodeAnalysisRuleSet>
80+
<LinkIncremental>false</LinkIncremental>
8081
</PropertyGroup>
8182
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8283
<OutDir>$(ProjectDir)\..\$(Configuration)\ImperatorToCK3\</OutDir>
@@ -89,7 +90,7 @@
8990
<LibraryPath>$(LibraryPath)</LibraryPath>
9091
<IncludePath>$(UniversalCRT_IncludePath);$(IncludePath)</IncludePath>
9192
<ReferencePath>$(ReferencePath)</ReferencePath>
92-
<LinkIncremental>false</LinkIncremental>
93+
<LinkIncremental>true</LinkIncremental>
9394
<RunCodeAnalysis>true</RunCodeAnalysis>
9495
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
9596
</PropertyGroup>
@@ -132,10 +133,11 @@
132133
<SDLCheck>true</SDLCheck>
133134
<ConformanceMode>true</ConformanceMode>
134135
<LanguageStandard>stdcpplatest</LanguageStandard>
135-
<AdditionalIncludeDirectories>Source;..\imageMagick\include-windows;..\commonItems;..\commonItems\compile-time-regular-expressions\single-header;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
136+
<AdditionalIncludeDirectories>Source;..\imageMagick\include-windows;..\commonItems;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
136137
<PreprocessorDefinitions>_UNICODE;UNICODE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SILENCE_CXX20_U8PATH_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137138
<LanguageStandard_C>stdc17</LanguageStandard_C>
138139
<MultiProcessorCompilation>true</MultiProcessorCompilation>
140+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
139141
</ClCompile>
140142
<Link>
141143
<SubSystem>Console</SubSystem>
@@ -185,12 +187,13 @@
185187
<SDLCheck>true</SDLCheck>
186188
<ConformanceMode>false</ConformanceMode>
187189
<LanguageStandard>stdcpplatest</LanguageStandard>
188-
<AdditionalIncludeDirectories>Source;..\imageMagick\include-windows;..\commonItems;..\commonItems\compile-time-regular-expressions\single-header;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
190+
<AdditionalIncludeDirectories>Source;..\imageMagick\include-windows;..\commonItems;..\cpp-base64;..\ZipLib;$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
189191
<MultiProcessorCompilation>true</MultiProcessorCompilation>
190192
<PreprocessorDefinitions>_UNICODE;UNICODE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SILENCE_CXX20_U8PATH_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
191193
<WholeProgramOptimization>true</WholeProgramOptimization>
192194
<EnablePREfast>true</EnablePREfast>
193195
<LanguageStandard_C>stdc17</LanguageStandard_C>
196+
<DebugInformationFormat>None</DebugInformationFormat>
194197
</ClCompile>
195198
<Link>
196199
<SubSystem>Console</SubSystem>
@@ -307,7 +310,6 @@
307310
<ClInclude Include="..\commonItems\Color.h" />
308311
<ClInclude Include="..\commonItems\CommonFunctions.h" />
309312
<ClInclude Include="..\commonItems\CommonRegexes.h" />
310-
<ClInclude Include="..\commonItems\compile-time-regular-expressions\single-header\ctre.hpp" />
311313
<ClInclude Include="..\commonItems\ConvenientParser.h" />
312314
<ClInclude Include="..\commonItems\Date.h" />
313315
<ClInclude Include="..\commonItems\GameVersion.h" />

‎ImperatorToCK3/ImperatorToCK3.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,6 @@
358358
<ClInclude Include="..\commonItems\CommonRegexes.h">
359359
<Filter>commonItems</Filter>
360360
</ClInclude>
361-
<ClInclude Include="..\commonItems\compile-time-regular-expressions\single-header\ctre.hpp">
362-
<Filter>commonItems</Filter>
363-
</ClInclude>
364361
<ClInclude Include="..\commonItems\ConvenientParser.h">
365362
<Filter>commonItems</Filter>
366363
</ClInclude>

‎ImperatorToCK3/Source/CK3/Province/CK3ProvinceMappings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ CK3::ProvinceMappings::ProvinceMappings(const std::string& theFile) {
1212

1313

1414
void CK3::ProvinceMappings::registerKeys() {
15-
registerMatcher(commonItems::integerMatch, [this](const std::string& provIDStr, std::istream& theStream) {
15+
registerRegex(commonItems::integerRegex, [this](const std::string& provIDStr, std::istream& theStream) {
1616
auto targetProvID = commonItems::stringToInteger<unsigned long long>(provIDStr);
1717
auto baseProvID = commonItems::getULlong(theStream);
1818
if (targetProvID != baseProvID) // if left and right IDs are equal, no point in mapping
1919
mappings.emplace(targetProvID, baseProvID);
2020
});
21-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
21+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
2222
}

‎ImperatorToCK3/Source/CK3/Province/CK3Provinces.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ CK3::Provinces::Provinces(const std::string& filePath) {
1212

1313

1414
void CK3::Provinces::registerKeys() {
15-
registerMatcher(commonItems::integerMatch, [this](const std::string& provIdStr, std::istream& theStream) {
15+
registerRegex(commonItems::integerRegex, [this](const std::string& provIdStr, std::istream& theStream) {
1616
auto provID = commonItems::stringToInteger<unsigned long long>(provIdStr);
1717
auto newProvince = std::make_shared<Province>(provID, theStream);
1818
provinces.emplace(provID, newProvince);
1919
});
20-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
20+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
2121
}

‎ImperatorToCK3/Source/CK3/Titles/LandedTitles.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void CK3::LandedTitles::registerKeys() {
3535

3636
Title::addFoundTitle(newTitle, foundTitles);
3737
});
38-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
38+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
3939
}
4040

4141

‎ImperatorToCK3/Source/CK3/Titles/Title.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void CK3::Title::registerKeys() {
6969
registerKeyword("province", [this](std::istream& theStream) {
7070
province = commonItems::getULlong(theStream);
7171
});
72-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
72+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
7373
}
7474

7575

‎ImperatorToCK3/Source/CK3/Titles/TitlesHistory.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void CK3::TitlesHistory::TitlesHistory::registerKeys() {
4040
currentGovernmentMap[titleName] = titleHistory.currentGovernmentWithDate.second;
4141
}
4242
});
43-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
43+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
4444
}
4545

4646

@@ -74,7 +74,7 @@ void CK3::TitleHistory::TitleHistory::registerKeys() {
7474
currentGovernmentWithDate = std::pair(date(dateStr), *historyEntry.government);
7575
}
7676
});
77-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
77+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
7878
}
7979

8080

@@ -96,5 +96,5 @@ void CK3::DatedHistoryEntry::DatedHistoryEntry::registerKeys() {
9696
registerKeyword("government", [this](std::istream& theStream) {
9797
government = commonItems::getString(theStream);
9898
});
99-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
99+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
100100
}

‎ImperatorToCK3/Source/Configuration/Configuration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void Configuration::registerKeys() {
6969
convertBirthAndDeathDates = false;
7070
Log(LogLevel::Info) << "Conversion of characters' birth and death dates set to: " << convertBirthAndDeathDates;
7171
});
72-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
72+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
7373
}
7474

7575

‎ImperatorToCK3/Source/Imperator/Characters/CharacterAttributes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ void Imperator::CharacterAttributes::registerKeys() {
2424
registerKeyword("zeal", [this](std::istream& theStream) {
2525
zeal = commonItems::getInt(theStream);
2626
});
27-
registerMatcher(commonItems::catchallRegexMatch, commonItems::ignoreItem);
27+
registerRegex(commonItems::catchallRegex, commonItems::ignoreItem);
2828
}

0 commit comments

Comments
 (0)