ModLoader swap to commons. (#211)

* ModLoader swap to commons. * cmake * clean up mods from configuration
ParadoxGameConverters · Jul 2, 2021 · c809f00 · c809f00
1 parent 18d4dea
commit c809f00
Show file tree

Hide file tree

Showing 23 changed files with 95 additions and 408 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "googletest"]
 	path = googletest
 	url = https://github.com/google/googletest.git
-[submodule "ZipLib"]
-	path = ZipLib
-	url = https://github.com/ParadoxGameConverters/ZipLib.git
 [submodule "imageMagick"]
 	path = imageMagick
 	url = https://github.com/ParadoxGameConverters/imageMagick.git
diff --git a/CK3toEU4.sln b/CK3toEU4.sln
@@ -16,13 +16,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CK3ToEU4Tests", "CK3ToEU4Te
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fronter", "Fronter\Fronter.vcxproj", "{D4E43E3D-E131-466D-9AA7-704C2298EACC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "ZipLib\extlibs\bzip2\bzip2.vcxproj", "{DBBF348D-C221-4F2E-8A0D-24EFA0D98E71}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZipLib", "commonItems\ZipLib\ZipLib.vcxproj", "{5C9FD859-DDF9-4510-8397-B329B0AE8C48}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzma", "ZipLib\extlibs\lzma\lzma.vcxproj", "{7EAD1358-3E72-4FB6-A212-25D462B5C1E9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "commonItems\ZipLib\extlibs\bzip2\bzip2.vcxproj", "{DBBF348D-C221-4F2E-8A0D-24EFA0D98E71}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "ZipLib\extlibs\zlib\zlib.vcxproj", "{BAEB16B3-DB4C-432F-9E6A-2ACADEA0691D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzma", "commonItems\ZipLib\extlibs\lzma\lzma.vcxproj", "{7EAD1358-3E72-4FB6-A212-25D462B5C1E9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZipLib", "ZipLib\ZipLib.vcxproj", "{5C9FD859-DDF9-4510-8397-B329B0AE8C48}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "commonItems\ZipLib\extlibs\zlib\zlib.vcxproj", "{BAEB16B3-DB4C-432F-9E6A-2ACADEA0691D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -42,6 +42,10 @@ Global
 		{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Debug|x64.Build.0 = Debug|x64
 		{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Release|x64.ActiveCfg = Release|x64
 		{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Release|x64.Build.0 = Release|x64
+		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Debug|x64.ActiveCfg = Debug|x64
+		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Debug|x64.Build.0 = Debug|x64
+		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Release|x64.ActiveCfg = Release|x64
+		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Release|x64.Build.0 = Release|x64
 		{DBBF348D-C221-4F2E-8A0D-24EFA0D98E71}.Debug|x64.ActiveCfg = Debug|x64
 		{DBBF348D-C221-4F2E-8A0D-24EFA0D98E71}.Debug|x64.Build.0 = Debug|x64
 		{DBBF348D-C221-4F2E-8A0D-24EFA0D98E71}.Release|x64.ActiveCfg = Release|x64
@@ -54,10 +58,6 @@ Global
 		{BAEB16B3-DB4C-432F-9E6A-2ACADEA0691D}.Debug|x64.Build.0 = Debug|x64
 		{BAEB16B3-DB4C-432F-9E6A-2ACADEA0691D}.Release|x64.ActiveCfg = Release|x64
 		{BAEB16B3-DB4C-432F-9E6A-2ACADEA0691D}.Release|x64.Build.0 = Release|x64
-		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Debug|x64.ActiveCfg = Debug|x64
-		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Debug|x64.Build.0 = Debug|x64
-		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Release|x64.ActiveCfg = Release|x64
-		{5C9FD859-DDF9-4510-8397-B329B0AE8C48}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/CK3toEU4/CK3toEU4.vcxproj b/CK3toEU4/CK3toEU4.vcxproj
@@ -55,13 +55,13 @@
     <ClCompile>
       <PreprocessorDefinitions>WIN32;NDEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_CONSOLE;_SILENCE_CXX20_U8PATH_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalIncludeDirectories>..\commonItems;..\ZipLib;..\imageMagick\include-windows</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\commonItems;..\commonItems\ZipLib;..\imageMagick\include-windows</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <AdditionalLibraryDirectories>..\imageMagick\lib-windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Resources\rakaly.dll.lib;CORE_RL_aom_.lib;CORE_RL_bzlib_.lib;CORE_RL_cairo_.lib;CORE_RL_croco_.lib;CORE_RL_exr_.lib;CORE_RL_ffi_.lib;CORE_RL_flif_.lib;CORE_RL_freetype_.lib;CORE_RL_fribidi_.lib;CORE_RL_glib_.lib;CORE_RL_harfbuzz_.lib;CORE_RL_jbig_.lib;CORE_RL_jp2_.lib;CORE_RL_jpeg_.lib;CORE_RL_lcms_.lib;CORE_RL_libde265_.lib;CORE_RL_libheif_.lib;CORE_RL_liblzma_.lib;CORE_RL_libraw_.lib;CORE_RL_librsvg_.lib;CORE_RL_libxml_.lib;CORE_RL_libzip_.lib;CORE_RL_lqr_.lib;CORE_RL_Magick++_.lib;CORE_RL_MagickCore_.lib;CORE_RL_MagickWand_.lib;CORE_RL_openjpeg_.lib;CORE_RL_pango_.lib;CORE_RL_pixman_.lib;CORE_RL_png_.lib;CORE_RL_tiff_.lib;CORE_RL_webp_.lib;CORE_RL_zlib_.lib;FILTER_analyze_.lib;ImageMagickObject.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Resources\rakaly.dll.lib;CORE_RL_aom_.lib;CORE_RL_bzlib_.lib;CORE_RL_cairo_.lib;CORE_RL_croco_.lib;CORE_RL_exr_.lib;CORE_RL_ffi_.lib;CORE_RL_flif_.lib;CORE_RL_freetype_.lib;CORE_RL_fribidi_.lib;CORE_RL_glib_.lib;CORE_RL_harfbuzz_.lib;CORE_RL_jbig_.lib;CORE_RL_jp2_.lib;CORE_RL_jpeg_.lib;CORE_RL_lcms_.lib;CORE_RL_libde265_.lib;CORE_RL_libheif_.lib;CORE_RL_liblzma_.lib;CORE_RL_libraw_.lib;CORE_RL_librsvg_.lib;CORE_RL_libxml_.lib;CORE_RL_libzip_.lib;CORE_RL_lqr_.lib;CORE_RL_Magick++_.lib;CORE_RL_MagickCore_.lib;CORE_RL_MagickWand_.lib;CORE_RL_openjpeg_.lib;CORE_RL_pango_.lib;CORE_RL_pixman_.lib;CORE_RL_png_.lib;CORE_RL_tiff_.lib;CORE_RL_webp_.lib;CORE_RL_zlib_.lib;FILTER_analyze_.lib;ImageMagickObject.lib;$(SolutionDir)$(Platform)\$(Configuration)\ZipLib.lib;$(SolutionDir)$(Platform)\$(Configuration)\bzip2.lib;$(SolutionDir)$(Platform)\$(Configuration)\lzma.lib;$(SolutionDir)$(Platform)\$(Configuration)\zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>Copy_Files.bat</Command>
@@ -94,6 +94,8 @@
     <ClInclude Include="..\commonItems\GameVersion.h" />
     <ClInclude Include="..\commonItems\iconvlite.h" />
     <ClInclude Include="..\commonItems\Log.h" />
+    <ClInclude Include="..\commonItems\ModLoader\ModLoader.h" />
+    <ClInclude Include="..\commonItems\ModLoader\ModParser.h" />
     <ClInclude Include="..\commonItems\OSCompatibilityLayer.h" />
     <ClInclude Include="..\commonItems\Parser.h" />
     <ClInclude Include="..\commonItems\ParserHelpers.h" />
@@ -117,8 +119,6 @@
     <ClInclude Include="Source\CK3World\Geography\CountyDetails.h" />
     <ClInclude Include="Source\CK3World\Geography\ProvinceHolding.h" />
     <ClInclude Include="Source\CK3World\Geography\ProvinceHoldings.h" />
-    <ClInclude Include="Source\CK3World\Mods\Mod.h" />
-    <ClInclude Include="Source\CK3World\Mods\Mods.h" />
     <ClInclude Include="Source\CK3World\Religions\Faith.h" />
     <ClInclude Include="Source\CK3World\Religions\Faiths.h" />
     <ClInclude Include="Source\CK3World\Religions\Religion.h" />
@@ -192,6 +192,8 @@
     <ClCompile Include="..\commonItems\GameVersion.cpp" />
     <ClCompile Include="..\commonItems\iconvlite.cpp" />
     <ClCompile Include="..\commonItems\Log.cpp" />
+    <ClCompile Include="..\commonItems\ModLoader\ModLoader.cpp" />
+    <ClCompile Include="..\commonItems\ModLoader\ModParser.cpp" />
     <ClCompile Include="..\commonItems\OSCommonLayer.cpp" />
     <ClCompile Include="..\commonItems\Parser.cpp" />
     <ClCompile Include="..\commonItems\ParserHelpers.cpp" />
@@ -216,8 +218,6 @@
     <ClCompile Include="Source\CK3World\Geography\CountyDetails.cpp" />
     <ClCompile Include="Source\CK3World\Geography\ProvinceHolding.cpp" />
     <ClCompile Include="Source\CK3World\Geography\ProvinceHoldings.cpp" />
-    <ClCompile Include="Source\CK3World\Mods\Mod.cpp" />
-    <ClCompile Include="Source\CK3World\Mods\Mods.cpp" />
     <ClCompile Include="Source\CK3World\Religions\Faith.cpp" />
     <ClCompile Include="Source\CK3World\Religions\Faiths.cpp" />
     <ClCompile Include="Source\CK3World\Religions\Religion.cpp" />
@@ -282,11 +282,6 @@
     <ClCompile Include="Source\Mappers\TraitScraper\TraitScraper.cpp" />
     <ClCompile Include="Source\Mappers\TraitScraper\TraitScraping.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ZipLib\ZipLib.vcxproj">
-      <Project>{5c9fd859-ddf9-4510-8397-b329b0ae8c48}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/CK3toEU4/CK3toEU4.vcxproj.filters b/CK3toEU4/CK3toEU4.vcxproj.filters
@@ -40,9 +40,6 @@
     <Filter Include="Helpers">
       <UniqueIdentifier>{b8f0c17a-bba5-4e2c-a35c-29da525cc60e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CK3World\Mods">
-      <UniqueIdentifier>{f149b03a-69e9-4ef6-a116-0b0ab2d38af7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="CK3World\Flags">
       <UniqueIdentifier>{2a9ce57e-33f2-4d14-b582-8c566644af3b}</UniqueIdentifier>
     </Filter>
@@ -112,6 +109,9 @@
     <Filter Include="EU4World\Religion">
       <UniqueIdentifier>{d10185d1-0fad-4d18-8a4c-249ea6deb425}</UniqueIdentifier>
     </Filter>
+    <Filter Include="CommonItems\ModLoader">
+      <UniqueIdentifier>{55ecf61d-6900-4f6d-95e7-715012a9d5cb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Source\CK3World\World.h">
@@ -208,12 +208,6 @@
     <ClInclude Include="Source\CK3World\Titles\LandedTitles.h">
       <Filter>CK3World\Titles</Filter>
     </ClInclude>
-    <ClInclude Include="Source\CK3World\Mods\Mod.h">
-      <Filter>CK3World\Mods</Filter>
-    </ClInclude>
-    <ClInclude Include="Source\CK3World\Mods\Mods.h">
-      <Filter>CK3World\Mods</Filter>
-    </ClInclude>
     <ClInclude Include="Source\CK3World\Flags\Flags.h">
       <Filter>CK3World\Flags</Filter>
     </ClInclude>
@@ -400,6 +394,12 @@
     <ClInclude Include="..\commonItems\ConverterVersion.h">
       <Filter>CommonItems</Filter>
     </ClInclude>
+    <ClInclude Include="..\commonItems\ModLoader\ModLoader.h">
+      <Filter>CommonItems\ModLoader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\commonItems\ModLoader\ModParser.h">
+      <Filter>CommonItems\ModLoader</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\commonItems\Log.cpp">
@@ -497,12 +497,6 @@
     <ClCompile Include="Source\CK3World\Titles\LandedTitles.cpp">
       <Filter>CK3World\Titles</Filter>
     </ClCompile>
-    <ClCompile Include="Source\CK3World\Mods\Mod.cpp">
-      <Filter>CK3World\Mods</Filter>
-    </ClCompile>
-    <ClCompile Include="Source\CK3World\Mods\Mods.cpp">
-      <Filter>CK3World\Mods</Filter>
-    </ClCompile>
     <ClCompile Include="Source\CK3World\Flags\Flags.cpp">
       <Filter>CK3World\Flags</Filter>
     </ClCompile>
@@ -689,5 +683,11 @@
     <ClCompile Include="..\commonItems\ConverterVersion.cpp">
       <Filter>CommonItems</Filter>
     </ClCompile>
+    <ClCompile Include="..\commonItems\ModLoader\ModLoader.cpp">
+      <Filter>CommonItems\ModLoader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\commonItems\ModLoader\ModParser.cpp">
+      <Filter>CommonItems\ModLoader</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/CK3toEU4/CMakeLists.txt b/CK3toEU4/CMakeLists.txt
@@ -17,11 +17,11 @@ add_compile_options("-pthread")
 add_link_options(-no-pie)
 
 include_directories("../commonItems")
-include_directories("../ZipLib")
+include_directories("../commonItems/ZipLib")
 include_directories("/usr/local/include/ImageMagick-7/")
 include_directories("${PROJECT_SOURCE_DIR}")
 link_directories(${CMAKE_SOURCE_DIR}/Resources /usr/local/lib)
-add_subdirectory(../ZipLib [binary_dir])
+add_subdirectory(../commonItems/ZipLib [binary_dir])
 
 set(MAIN_SOURCES ${MAIN_SOURCES} "${PROJECT_SOURCE_DIR}/CK3ToEU4Converter.cpp")
 set(MAIN_SOURCES ${MAIN_SOURCES} "${PROJECT_SOURCE_DIR}/main.cpp")
@@ -46,8 +46,6 @@ set(CK3WORLD_GEOGRAPHY_SOURCES ${CK3WORLD_GEOGRAPHY_SOURCES} "${PROJECT_SOURCE_D
 set(CK3WORLD_GEOGRAPHY_SOURCES ${CK3WORLD_GEOGRAPHY_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Geography/ProvinceHolding.cpp")
 set(CK3WORLD_GEOGRAPHY_SOURCES ${CK3WORLD_GEOGRAPHY_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Geography/CountyDetails.cpp")
 set(CK3WORLD_GEOGRAPHY_SOURCES ${CK3WORLD_GEOGRAPHY_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Geography/CountyDetail.cpp")
-set(CK3WORLD_MODS_SOURCES ${CK3WORLD_MODS_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Mods/Mod.cpp")
-set(CK3WORLD_MODS_SOURCES ${CK3WORLD_MODS_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Mods/Mods.cpp")
 set(CK3WORLD_RELIGIONS_SOURCES ${CK3WORLD_RELIGIONS_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Religions/Faith.cpp")
 set(CK3WORLD_RELIGIONS_SOURCES ${CK3WORLD_RELIGIONS_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Religions/Faiths.cpp")
 set(CK3WORLD_RELIGIONS_SOURCES ${CK3WORLD_RELIGIONS_SOURCES} "${PROJECT_SOURCE_DIR}/CK3World/Religions/Religion.cpp")
@@ -120,6 +118,8 @@ set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/Date.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/GameVersion.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/LinuxUtils.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/Log.cpp")
+set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/ModLoader/ModLoader.cpp")
+set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/ModLoader/ModParser.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/OSCommonLayer.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/Parser.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/ParserHelpers.cpp")
@@ -137,7 +137,6 @@ add_executable(CK3toEU4
 	${CK3WORLD_DYNASTIES_SOURCES}
 	${CK3WORLD_FLAGS_SOURCES}
 	${CK3WORLD_GEOGRAPHY_SOURCES}
-	${CK3WORLD_MODS_SOURCES}
 	${CK3WORLD_RELIGIONS_SOURCES}
 	${CK3WORLD_TITLES_SOURCES}
 

diff --git a/CK3toEU4/Source/CK3World/Mods/Mod.cpp b/CK3toEU4/Source/CK3World/Mods/Mod.cpp
diff --git a/CK3toEU4/Source/CK3World/Mods/Mod.h b/CK3toEU4/Source/CK3World/Mods/Mod.h