From 1d4ef54e7cc5acc6218b84c4930ba434be382408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivo=20Elezovi=C4=87?= Date: Sun, 5 Feb 2023 00:07:52 +0100 Subject: [PATCH] RELEASE THE KRAKEN (#1611) * RELEASE THE KRAKEN * wf * try swapping deps * maybe like so * linux pch & declutter * clang * gcov * wf * cleanup --- .../workflows/{clang-tidy.yml => clang-tidy} | 0 .github/workflows/linux-analysis.yml | 16 +- .../workflows/windows_build_test_and_push.yml | 8 +- CMakeLists.txt | 330 +- Vic2ToHoI4.sln | 13 +- Vic2ToHoI4.vcxproj | 828 +---- Vic2ToHoI4.vcxproj.filters | 2774 ---------------- Vic2ToHoI4Tests.vcxproj | 835 +---- Vic2ToHoI4Tests.vcxproj.filters | 2714 +--------------- Vic2ToHoI4lib.vcxproj | 889 ++++++ Vic2ToHoI4lib.vcxproj.filters | 2784 +++++++++++++++++ Vic2ToHoI4lib.vcxproj.user | 4 + external/Fronter | 2 +- external/common_items | 2 +- tools/build_Vic2ToHoI4_release.sh | 10 +- tools/build_Vic2ToHoI4_release_foreign.sh | 0 tools/build_fronter.sh | 0 tools/clang-format-all.sh | 0 tools/generate_coverage_report.sh | 0 tools/run_clang_tidy.sh | 2 +- tools/run_linux_tests.sh | 0 21 files changed, 4034 insertions(+), 7177 deletions(-) rename .github/workflows/{clang-tidy.yml => clang-tidy} (100%) create mode 100644 Vic2ToHoI4lib.vcxproj create mode 100644 Vic2ToHoI4lib.vcxproj.filters create mode 100644 Vic2ToHoI4lib.vcxproj.user mode change 100644 => 100755 tools/build_Vic2ToHoI4_release.sh mode change 100644 => 100755 tools/build_Vic2ToHoI4_release_foreign.sh mode change 100644 => 100755 tools/build_fronter.sh mode change 100644 => 100755 tools/clang-format-all.sh mode change 100644 => 100755 tools/generate_coverage_report.sh mode change 100644 => 100755 tools/run_clang_tidy.sh mode change 100644 => 100755 tools/run_linux_tests.sh diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy similarity index 100% rename from .github/workflows/clang-tidy.yml rename to .github/workflows/clang-tidy diff --git a/.github/workflows/linux-analysis.yml b/.github/workflows/linux-analysis.yml index 8684eb3c57..f519c676ff 100644 --- a/.github/workflows/linux-analysis.yml +++ b/.github/workflows/linux-analysis.yml @@ -1,5 +1,4 @@ name: "Linux-based analysis" - env: COVERAGE: YES @@ -35,9 +34,8 @@ jobs: - name: "Cloning selective submodules" run: | git submodule update --init --recursive external/common_items - git -c submodule."googletest".update=none \ - -c submodule."external/googletest".update=none \ - -c submodule."external/zip".update=none \ + git -c submodule."external/commonItems".update=none \ + -c submodule."googletest".update=none \ submodule update --init --recursive external/Fronter - name: Initialize CodeQL @@ -47,7 +45,7 @@ jobs: - name: Build solution run: | - cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter Fronter Vic2ToHoi4ConverterTests -- -j40 + cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter ConverterFrontend Vic2ToHoi4ConverterTests -- -j40 - name: Run tests run: | @@ -97,9 +95,8 @@ jobs: - name: "Cloning selective submodules" run: | git submodule update --init --recursive external/common_items - git -c submodule."googletest".update=none \ - -c submodule."external/googletest".update=none \ - -c submodule."external/zip".update=none \ + git -c submodule."external/commonItems".update=none \ + -c submodule."googletest".update=none \ submodule update --init --recursive external/Fronter - name: Initialize CodeQL @@ -131,7 +128,7 @@ jobs: export CXX=/usr/bin/g++-12 # Check versions of gcc, g++ and cmake # Run your build commands next - cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter Fronter Vic2ToHoi4ConverterTests -- -j3 + cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter ConverterFrontend Vic2ToHoi4ConverterTests -- -j5 - name: Run tests run: | @@ -141,6 +138,7 @@ jobs: - name: Run gcov run: | cd build + pwd make gcov - name: Run lcov diff --git a/.github/workflows/windows_build_test_and_push.yml b/.github/workflows/windows_build_test_and_push.yml index cdb87413df..e50f76e44a 100644 --- a/.github/workflows/windows_build_test_and_push.yml +++ b/.github/workflows/windows_build_test_and_push.yml @@ -25,10 +25,8 @@ jobs: - name: "Cloning selective submodules" run: | git submodule update --init --recursive external\common_items - git -c submodule."external/commonItems".update=none ` + git -c submodule."external/common_items".update=none ` -c submodule."googletest".update=none ` - -c submodule."external/googletest".update=none ` - -c submodule."external/zip".update=none ` submodule update --init --recursive external\Fronter - name: "Get previous tag" @@ -98,10 +96,8 @@ jobs: - name: "Cloning selective submodules" run: | git submodule update --init --recursive external\common_items - git -c submodule."external/commonItems".update=none ` + git -c submodule."external/common_items".update=none ` -c submodule."googletest".update=none ` - -c submodule."external/googletest".update=none ` - -c submodule."external/zip".update=none ` submodule update --init --recursive external\Fronter - name: "Build solution" diff --git a/CMakeLists.txt b/CMakeLists.txt index fb9cdec42a..074fc457a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,26 +1,36 @@ -cmake_minimum_required(VERSION 3.13) -#set(CMAKE_VERBOSE_MAKEFILE on) +cmake_minimum_required(VERSION 3.16) project(Vic2ToHoI4) set(DATA_FILE_DIR ${CMAKE_SOURCE_DIR}/data) set(FRONTER_DATA_FILE_DIR ${CMAKE_SOURCE_DIR}/external/Fronter/Fronter/Resources) set(PROJECT_SOURCE_DIR ${CMAKE_SOURCE_DIR}) +set(FRONTER_SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/Fronter/Fronter/Source) set(FRONTER_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/Release-Linux) set(CONVERTER_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/Release-Linux/Vic2ToHoI4) set(TEST_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build/Release-LinuxTests) set(CMAKE_CXX_STANDARD 20) #if (DEFINED ENV{COVERAGE}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -Wall -fprofile-arcs -ftest-coverage") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE ON) #elseif (DEFINED ENV{COVERAGE}) # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -Wall") #endif (DEFINED ENV{COVERAGE}) add_compile_options("-O3") +add_compile_options(-D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread) #add_compile_options("-g") +find_package(CURL REQUIRED) + include_directories(${PROJECT_SOURCE_DIR}) +include_directories("/usr/include/wx-3.2-unofficial") +include_directories("/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.2-unofficial") +include_directories("external/Fronter/external/SQLiteCpp/include") +include_directories("external/Fronter/external/SQLiteCpp/sqlite3") +include_directories("external/Fronter/Fronter/Source") +include_directories(external/common_items) +include_directories(external/common_items/external/json/single_include) include_directories(external/common_items/external/googletest/googletest) include_directories(external/common_items/external/googletest/googletest/include) include_directories(external/common_items/external/googletest/googlemock) @@ -28,6 +38,29 @@ include_directories(external/common_items/external/googletest/googlemock/include #### Converter #### +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/BulkParser.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Color.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/CommonFunctions.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/CommonRegexes.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ConvenientParser.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ConverterVersion.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Date.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/GameVersion.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Log.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/OSCompatibilityLayer.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Parser.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ParserHelpers.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/StringUtils.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/targa.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ModLoader/ModFilesystem.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ModLoader/Mod.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ModLoader/ModLoader.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ModLoader/ModParser.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Localization/LocalizationBlock.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Localization/LocalizationDatabase.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Localization/LocalizationLambdas.h") +set(PCH_SOURCES ${PCH_SOURCES} "${PROJECT_SOURCE_DIR}/external/bitmap/bitmap_image.hpp") + file(GLOB HOI4WORLD_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/*.cpp") set(HOI4WORLD_CHARACTERS_SOURCES ${HOI4WORLD_CHARACTERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Characters/AdmiralDataFactory.cpp") set(HOI4WORLD_CHARACTERS_SOURCES ${HOI4WORLD_CHARACTERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Characters/AdvisorDataFactory.cpp") @@ -113,52 +146,6 @@ set(HOI4WORLD_TANK_DESIGNS_SOURCES ${HOI4WORLD_TANK_DESIGNS_SOURCES} "${PROJECT_ set(HOI4WORLD_UNIT_MEDALS_SOURCES ${HOI4WORLD_UNIT_MEDALS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/UnitMedals/IdeologicalUnitMedals.cpp") set(HOI4WORLD_WAR_CREATOR_SOURCES ${HOI4WORLD_WAR_CREATOR_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/WarCreator/MapUtils.cpp") set(HOI4WORLD_WAR_CREATOR_SOURCES ${HOI4WORLD_WAR_CREATOR_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/WarCreator/HoI4WarCreator.cpp") -add_library(HoI4World - ${HOI4_SOURCES} - ${HOI4WORLD_CHARACTERS_SOURCES} - ${HOI4_DECISIONS_SOURCES} - ${HOI4_DIPLOMACY_SOURCES} - ${HOI4_EVENTS_SOURCES} - ${HOI4_NAVIES_SOURCES} - ${HOI4_SCRIPTED_LOCALISATIONS_SOURCES} - ${HOI4_SHIP_TYPES_SOURCES} - ${HOI4_STATES_SOURCES} - ${HOI4WORLD_SOURCES} - ${HOI4WORLD_COUNTRY_SOURCES} - ${HOI4WORLD_COUNTRY_CATEGORIES_SOURCES} - ${HOI4WORLD_DECISIONS_SOURCES} - ${HOI4WORLD_DIPLOMACY_SOURCES} - ${HOI4WORLD_EVENTS_SOURCES} - ${HOI4WORLD_FOCUS_TREES_SOURCES} - ${HOI4WORLD_GAME_RULES_SOURCES} - ${HOI4WORLD_IDEAS_SOURCES} - ${HOI4WORLD_IDEOLOGIES_SOURCES} - ${HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES} - ${HOI4WORLD_LEADERS_SOURCES} - ${HOI4WORLD_LOCALISATIONS_SOURCES} - ${HOI4WORLD_LOCALISATIONS_ARTICLERULES_SOURCES} - ${HOI4WORLD_MILITARY_SOURCES} - ${HOI4WORLD_MILITARY_MAPPINGS_SOURCES} - ${HOI4WORLD_MAP_SOURCES} - ${HOI4WORLD_MODIFIERS_SOURCES} - ${HOI4WORLD_NAMES_SOURCES} - ${HOI4WORLD_NAVIES_SOURCES} - ${HOI4WORLD_OCCUPATION_LAWS_SOURCES} - ${HOI4WORLD_OPERATIONS_SOURCES} - ${HOI4WORLD_OPERATIVE_NAMES_SOURCES} - ${HOI4WORLD_PEACECONFERENCES_SOURCES} - ${HOI4WORLD_PLANE_DESIGNS_SOURCES} - ${HOI4WORLD_REGIONS_SOURCES} - ${HOI4WORLD_SCRIPTED_EFFECTS_SOURCES} - ${HOI4WORLD_SCRIPTED_LOCALISATIONS_SOURCES} - ${HOI4WORLD_SCRIPTED_TRIGGERS_SOURCES} - ${HOI4WORLD_SHIP_TYPES_SOURCES} - ${HOI4WORLD_STATES_SOURCES} - ${HOI4WORLD_SOUNDS_SOURCES} - ${HOI4WORLD_TANK_DESIGNS_SOURCES} - ${HOI4WORLD_UNIT_MEDALS_SOURCES} - ${HOI4WORLD_WAR_CREATOR_SOURCES} -) set(MAPPERS_CASUS_BELLIS_SOURCES ${MAPPERS_CASUS_BELLIS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/CasusBelli/CasusBelliMappingFactory.cpp") set(MAPPERS_CASUS_BELLIS_SOURCES ${MAPPERS_CASUS_BELLIS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/CasusBelli/CasusBellis.cpp") @@ -194,26 +181,10 @@ set(MAPPERS_TECHNOLOGY_SOURCES ${MAPPERS_TECHNOLOGY_SOURCES} "${PROJECT_SOURCE_D set(MAPPERS_FACTIONNAME_SOURCES ${MAPPERS_FACTIONNAME_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/FactionName/FactionNameMapperFactory.cpp") set(MAPPERS_FACTIONNAME_SOURCES ${MAPPERS_FACTIONNAME_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/FactionName/FactionNameMappingFactory.cpp") set(MAPPERS_FACTIONNAME_SOURCES ${MAPPERS_FACTIONNAME_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/FactionName/FactionNameMapper.cpp") -add_library(Mappers - ${MAPPERS_CASUS_BELLIS_SOURCES} - ${MAPPERS_COUNTRY_SOURCES} - ${MAPPERS_COUNTRYNAME_SOURCES} - ${MAPPERS_FLAGS_TO_IDEAS_SOURCES} - ${MAPPERS_GOVERNMENT_SOURCES} - ${MAPPERS_GRAPHICS_SOURCES} - ${MAPPERS_IDEOLOGY_SOURCES} - ${MAPPERS_MERGE_RULES_SOURCES} - ${MAPPERS_TECHNOLOGY_SOURCES} - ${MAPPERS_PROVINCES_SOURCES} - ${MAPPERS_FACTIONNAME_SOURCES} -) set (MAPS_SOURCES ${MAPS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Maps/MapData.cpp") set (MAPS_SOURCES ${MAPS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Maps/ProvinceDefinitions.cpp") set (MAPS_SOURCES ${MAPS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Maps/ProvincePoints.cpp") -add_library(Map - ${MAPS_SOURCES} -) set(VIC2WORLD_AI_SOURCES ${VIC2WORLD_AI_SOURCES} "${PROJECT_SOURCE_DIR}/src/V2World/Ai/AI.cpp") set(VIC2WORLD_AI_SOURCES ${VIC2WORLD_AI_SOURCES} "${PROJECT_SOURCE_DIR}/src/V2World/Ai/AIFactory.cpp") @@ -270,26 +241,6 @@ set(VIC2WORLD_WARS_SOURCES ${VIC2WORLD_WARS_SOURCES} "${PROJECT_SOURCE_DIR}/src/ set(VIC2WORLD_WARS_SOURCES ${VIC2WORLD_WARS_SOURCES} "${PROJECT_SOURCE_DIR}/src/V2World/Wars/WarGoalFactory.cpp") set(VIC2WORLD_WORLD_SOURCES ${VIC2WORLD_WORLD_SOURCES} "${PROJECT_SOURCE_DIR}/src/V2World/World/World.cpp") set(VIC2WORLD_WORLD_SOURCES ${VIC2WORLD_WORLD_SOURCES} "${PROJECT_SOURCE_DIR}/src/V2World/World/WorldFactory.cpp") -add_library(Vic2World - ${VIC2WORLD_AI_SOURCES} - ${VIC2WORLD_COUNTRIES_SOURCES} - ${VIC2WORLD_CULTURES_SOURCES} - ${VIC2WORLD_DIPLOMACY_SOURCES} - ${VIC2WORLD_EU4TOVIC2DATA_SOURCES} - ${VIC2WORLD_ISSUES_SOURCES} - ${VIC2WORLD_LOCALISATIONS_SOURCES} - ${VIC2WORLD_MAP_SOURCES} - ${VIC2WORLD_MILITARY_SOURCES} - ${VIC2WORLD_MILITARY_LEADERS_SOURCES} - ${VIC2WORLD_POLITICS_SOURCES} - ${VIC2WORLD_POPS_SOURCES} - ${VIC2WORLD_PROVINCES_SOURCES} - ${VIC2WORLD_STATES_SOURCES} - ${VIC2WORLD_STOCKPILES_SOURCES} - ${VIC2WORLD_TECHNOLOGY_SOURCES} - ${VIC2WORLD_WARS_SOURCES} - ${VIC2WORLD_WORLD_SOURCES} -) file(GLOB OUTHOI4_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/*.cpp") set(OUTHOI4_AI_STRATEGY_SOURCES ${OUTHOI4_AI_STRATEGY_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/AiStrategy/OutAiStrategy.cpp") @@ -338,7 +289,38 @@ set(OUTHOI4_TANK_DESIGNS_SOURCES ${OUTHOI4_TANK_DESIGNS_SOURCES} "${PROJECT_SOUR set(OUTHOI4_TANK_DESIGNS_SOURCES ${OUTHOI4_TANK_DESIGNS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/TankDesigns/OutTankModules.cpp") set(OUTHOI4_TANK_DESIGNS_SOURCES ${OUTHOI4_TANK_DESIGNS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/TankDesigns/OutTankUpgrades.cpp") set(OUTHOI4_UNIT_MEDALS_SOURCES ${OUTHOI4_TANK_DESIGNS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/UnitMedals/OutUnitMedals.cpp") -add_library(OutHoI4World + +file(GLOB MAIN_SOURCE "${PROJECT_SOURCE_DIR}/src/main.cpp") +file(GLOB CONVERTER_SOURCES ${CONVERTER_SOURCES} "${PROJECT_SOURCE_DIR}/src/Configuration.cpp") +file(GLOB CONVERTER_SOURCES ${CONVERTER_SOURCES} "${PROJECT_SOURCE_DIR}/src/Vic2toHOI4Converter.cpp") + +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/BulkParser.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Color.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/CommonFunctions.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ConvenientParser.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ConverterVersion.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Date.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/GameVersion.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/iconvlite.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/LinuxUtils.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Log.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ModLoader/ModFilesystem.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ModLoader/ModLoader.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ModLoader/ModParser.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/OSCommonLayer.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/Parser.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/ParserHelpers.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/StringUtils.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/targa.cpp") +set(COMMON_SOURCES ${COMMON_SOURCES} "${PROJECT_SOURCE_DIR}/external/common_items/external/zip/src/zip.c") + +add_library(CommonItems ${COMMON_SOURCES}) + +# add all vic2 sources to a list. + +list(APPEND ALL_HOI4_FILES + ${CONVERTER_SOURCES} + ${OUTHOI4_SOURCES} ${OUTHOI4_CHARACTERS_SOURCES} ${OUTHOI4_COUNTRY_SOURCES} @@ -372,42 +354,104 @@ add_library(OutHoI4World ${OUTHOI4_TANK_DESIGNS_SOURCES} ${OUTHOI4_UNIT_MEDALS_SOURCES} ${OUTHOI4_VERSION} -) -file(GLOB MAIN_SOURCE "${PROJECT_SOURCE_DIR}/src/main.cpp") -file(GLOB CONVERTER_SOURCES ${CONVERTER_SOURCES} "${PROJECT_SOURCE_DIR}/src/Configuration.cpp") -file(GLOB CONVERTER_SOURCES ${CONVERTER_SOURCES} "${PROJECT_SOURCE_DIR}/src/Vic2toHOI4Converter.cpp") + ${VIC2WORLD_AI_SOURCES} + ${VIC2WORLD_COUNTRIES_SOURCES} + ${VIC2WORLD_CULTURES_SOURCES} + ${VIC2WORLD_DIPLOMACY_SOURCES} + ${VIC2WORLD_EU4TOVIC2DATA_SOURCES} + ${VIC2WORLD_ISSUES_SOURCES} + ${VIC2WORLD_LOCALISATIONS_SOURCES} + ${VIC2WORLD_MAP_SOURCES} + ${VIC2WORLD_MILITARY_SOURCES} + ${VIC2WORLD_MILITARY_LEADERS_SOURCES} + ${VIC2WORLD_POLITICS_SOURCES} + ${VIC2WORLD_POPS_SOURCES} + ${VIC2WORLD_PROVINCES_SOURCES} + ${VIC2WORLD_STATES_SOURCES} + ${VIC2WORLD_STOCKPILES_SOURCES} + ${VIC2WORLD_TECHNOLOGY_SOURCES} + ${VIC2WORLD_WARS_SOURCES} + ${VIC2WORLD_WORLD_SOURCES} + + ${MAPPERS_CASUS_BELLIS_SOURCES} + ${MAPPERS_COUNTRY_SOURCES} + ${MAPPERS_COUNTRYNAME_SOURCES} + ${MAPPERS_FLAGS_TO_IDEAS_SOURCES} + ${MAPPERS_GOVERNMENT_SOURCES} + ${MAPPERS_GRAPHICS_SOURCES} + ${MAPPERS_IDEOLOGY_SOURCES} + ${MAPPERS_MERGE_RULES_SOURCES} + ${MAPPERS_TECHNOLOGY_SOURCES} + ${MAPPERS_PROVINCES_SOURCES} + ${MAPPERS_FACTIONNAME_SOURCES} -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/Color.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/CommonFunctions.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/ConvenientParser.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/ConverterVersion.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/Date.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/GameVersion.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/iconvlite.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/LinuxUtils.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/Log.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/ModLoader/ModFilesystem.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/ModLoader/ModLoader.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/ModLoader/ModParser.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/OSCommonLayer.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/Parser.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/ParserHelpers.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/StringUtils.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/targa.cpp") -set(COMMON_SOURCES ${COMMON_SOURCES} "external/common_items/external/zip/src/zip.c") + ${MAPS_SOURCES} + + ${HOI4_SOURCES} + ${HOI4WORLD_CHARACTERS_SOURCES} + ${HOI4_DECISIONS_SOURCES} + ${HOI4_DIPLOMACY_SOURCES} + ${HOI4_EVENTS_SOURCES} + ${HOI4_NAVIES_SOURCES} + ${HOI4_SCRIPTED_LOCALISATIONS_SOURCES} + ${HOI4_SHIP_TYPES_SOURCES} + ${HOI4_STATES_SOURCES} + ${HOI4WORLD_SOURCES} + ${HOI4WORLD_COUNTRY_SOURCES} + ${HOI4WORLD_COUNTRY_CATEGORIES_SOURCES} + ${HOI4WORLD_DECISIONS_SOURCES} + ${HOI4WORLD_DIPLOMACY_SOURCES} + ${HOI4WORLD_EVENTS_SOURCES} + ${HOI4WORLD_FOCUS_TREES_SOURCES} + ${HOI4WORLD_GAME_RULES_SOURCES} + ${HOI4WORLD_IDEAS_SOURCES} + ${HOI4WORLD_IDEOLOGIES_SOURCES} + ${HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES} + ${HOI4WORLD_LEADERS_SOURCES} + ${HOI4WORLD_LOCALISATIONS_SOURCES} + ${HOI4WORLD_LOCALISATIONS_ARTICLERULES_SOURCES} + ${HOI4WORLD_MILITARY_SOURCES} + ${HOI4WORLD_MILITARY_MAPPINGS_SOURCES} + ${HOI4WORLD_MAP_SOURCES} + ${HOI4WORLD_MODIFIERS_SOURCES} + ${HOI4WORLD_NAMES_SOURCES} + ${HOI4WORLD_NAVIES_SOURCES} + ${HOI4WORLD_OCCUPATION_LAWS_SOURCES} + ${HOI4WORLD_OPERATIONS_SOURCES} + ${HOI4WORLD_OPERATIVE_NAMES_SOURCES} + ${HOI4WORLD_PEACECONFERENCES_SOURCES} + ${HOI4WORLD_PLANE_DESIGNS_SOURCES} + ${HOI4WORLD_REGIONS_SOURCES} + ${HOI4WORLD_SCRIPTED_EFFECTS_SOURCES} + ${HOI4WORLD_SCRIPTED_LOCALISATIONS_SOURCES} + ${HOI4WORLD_SCRIPTED_TRIGGERS_SOURCES} + ${HOI4WORLD_SHIP_TYPES_SOURCES} + ${HOI4WORLD_STATES_SOURCES} + ${HOI4WORLD_SOUNDS_SOURCES} + ${HOI4WORLD_TANK_DESIGNS_SOURCES} + ${HOI4WORLD_UNIT_MEDALS_SOURCES} + ${HOI4WORLD_WAR_CREATOR_SOURCES} +) +# filter globbed tests out. +list(FILTER ALL_HOI4_FILES EXCLUDE REGEX ".*Tests\\.cpp$") + +add_library(Vic2ToHoi4lib + ${ALL_HOI4_FILES} +) +target_precompile_headers(Vic2ToHoi4lib PUBLIC ${PCH_SOURCES}) +target_link_libraries(Vic2ToHoi4lib LINK_PUBLIC CommonItems) add_executable( Vic2ToHoi4Converter ${MAIN_SOURCE} - ${CONVERTER_SOURCES} - ${COMMON_SOURCES} ) set_target_properties( Vic2ToHoi4Converter PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CONVERTER_OUTPUT_DIRECTORY} ) -target_link_libraries(Vic2ToHoi4Converter OutHoI4World HoI4World Map Vic2World Mappers pthread) +target_precompile_headers(Vic2ToHoi4Converter REUSE_FROM Vic2ToHoi4lib) +target_link_libraries(Vic2ToHoi4Converter LINK_PUBLIC Vic2ToHoi4lib) configure_file("${DATA_FILE_DIR}/configuration-example.txt" "${CONVERTER_OUTPUT_DIRECTORY}/configuration-example.txt" COPYONLY) configure_file("${DATA_FILE_DIR}/FAQ.txt" "${CONVERTER_OUTPUT_DIRECTORY}/../FAQ.txt" COPYONLY) @@ -481,18 +525,51 @@ file(COPY "${DATA_FILE_DIR}/configurables/CustomizedFocusBranches/" DESTINATION file(COPY "${DATA_FILE_DIR}/flags" DESTINATION "${CONVERTER_OUTPUT_DIRECTORY}") add_custom_command(TARGET Vic2ToHoi4Converter POST_BUILD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND git rev-parse HEAD > build/Release-Linux/commit_id.txt) - #### Fronter #### -add_custom_target(Fronter - COMMAND tools/build_fronter.sh - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +file(GLOB F_MAIN_SOURCES "${FRONTER_SOURCE_DIR}/*.cpp") +file(GLOB F_CONFIGURATION_SOURCES "${FRONTER_SOURCE_DIR}/Configuration/*.cpp") +file(GLOB F_CONFIGURATION_OPTIONS_SOURCES "${FRONTER_SOURCE_DIR}/Configuration/Options/*.cpp") +file(GLOB F_FRAMES_SOURCES "${FRONTER_SOURCE_DIR}/Frames/*.cpp") +file(GLOB F_FRAMES_TABS_SOURCES "${FRONTER_SOURCE_DIR}/Frames/Tabs/*.cpp") +file(GLOB F_UTILS_SOURCES "${FRONTER_SOURCE_DIR}/Utils/*.cpp") +file(GLOB F_UTILS_LOCALIZATION_SOURCES "${FRONTER_SOURCE_DIR}/Utils/Localization/*.cpp") +file(GLOB F_CONVERTERLAUNCHER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/ConverterLauncher/*.cpp") +list(REMOVE_ITEM F_CONVERTERLAUNCHER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/ConverterLauncher/WinConverterLauncher.cpp") +file(GLOB F_LOGWATCHER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/LogWatcher/*.cpp") +file(GLOB F_MODCOPIER_SOURCES "${FRONTER_SOURCE_DIR}/WorkerThreads/ModCopier/*.cpp") +file(GLOB F_UPDATECHECKER_SOURCES "${FRONTER_SOURCE_DIR}/UpdateChecker/*.cpp") +file(GLOB F_SQLITE_SOURCES "${FRONTER_SOURCE_DIR}/../../external/SQLiteCpp/src/*.cpp") +file(GLOB F_SQLITE3_SOURCES "${FRONTER_SOURCE_DIR}/../../external/SQLiteCpp/sqlite3/*.c") + +add_executable(ConverterFrontend + ${F_MAIN_SOURCES} + ${F_CONFIGURATION_SOURCES} + ${F_CONFIGURATION_OPTIONS_SOURCES} + ${F_FRAMES_SOURCES} + ${F_FRAMES_TABS_SOURCES} + ${F_UTILS_SOURCES} + ${F_UTILS_LOCALIZATION_SOURCES} + ${F_CONVERTERLAUNCHER_SOURCES} + ${F_LOGWATCHER_SOURCES} + ${F_MODCOPIER_SOURCES} + ${F_UPDATECHECKER_SOURCES} + ${F_SQLITE_SOURCES} + ${F_SQLITE3_SOURCES} ) -add_custom_command(TARGET Fronter - COMMAND cp -r "data/fronter/" "${FRONTER_OUTPUT_DIRECTORY}/Configuration" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + +find_package(wxWidgets REQUIRED COMPONENTS net core base) +include(${wxWidgets_USE_FILE}) +set_target_properties(ConverterFrontend + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${FRONTER_OUTPUT_DIRECTORY} ) +target_link_libraries(ConverterFrontend LINK_PUBLIC ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES} CommonItems) +add_custom_command(TARGET ConverterFrontend + COMMAND mkdir -p "${FRONTER_OUTPUT_DIRECTORY}/Configuration/" && cp -r "data/fronter/*" "${FRONTER_OUTPUT_DIRECTORY}/Configuration/" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +) #### Tests #### @@ -657,8 +734,7 @@ set(VIC2WORLD_WAR_TESTS_SOURCES ${VIC2WORLD_WAR_TESTS_SOURCES} "${PROJECT_SOURCE set(VIC2WORLD_WAR_TESTS_SOURCES ${VIC2WORLD_WAR_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/V2World/Wars/WarGoalFactoryTests.cpp") set(VIC2WORLD_WORLD_TESTS_SOURCES ${VIC2WORLD_WORLD_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/V2World/World/WorldTests.cpp") -add_executable( - Vic2ToHoi4ConverterTests +list(APPEND ALL_HOI4_TESTS_FILES ${CONVERTER_SOURCES} ${CONFIGURATION_TESTS_SOURCES} ${HOI4WORLD_TESTS_SOURCES} @@ -730,13 +806,22 @@ add_executable( ${VIC2WORLD_TECHNOLOGY_TESTS_SOURCES} ${VIC2WORLD_WAR_TESTS_SOURCES} ${VIC2WORLD_WORLD_TESTS_SOURCES} - ${COMMON_SOURCES} +) + +# fish out only actual tests. +list(FILTER ALL_HOI4_TESTS_FILES INCLUDE REGEX ".*Tests\\.cpp$") + +add_executable( + Vic2ToHoi4ConverterTests + ${ALL_HOI4_TESTS_FILES} ${GMOCK_SOURCES} ) set_target_properties( Vic2ToHoi4ConverterTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TEST_OUTPUT_DIRECTORY} ) +target_precompile_headers(Vic2ToHoi4ConverterTests REUSE_FROM Vic2ToHoi4lib) + configure_file("data/test_files/blank_operative_codenames.txt" "${TEST_OUTPUT_DIRECTORY}/common/units/codenames_operatives/blank_operative_codenames.txt" COPYONLY) configure_file("data/test_files/definition.csv" "${TEST_OUTPUT_DIRECTORY}/HoI4Linux/map/definition.csv" COPYONLY) configure_file("data/test_files/Configurables/ideological_ai_peace.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/ideological_ai_peace.txt" COPYONLY) @@ -859,7 +944,7 @@ configure_file("data/test_files/v2gameMacOS" "${TEST_OUTPUT_DIRECTORY}/something configure_file("data/test_files/vic2_mod_regions.txt" "${TEST_OUTPUT_DIRECTORY}/mod/test_mod/map/region.txt" COPYONLY) configure_file("data/test_files/vic2_vanilla_regions.txt" "${TEST_OUTPUT_DIRECTORY}/map/region.txt" COPYONLY) -target_link_libraries(Vic2ToHoi4ConverterTests OutHoI4World HoI4World Map Vic2World Mappers pthread) +target_link_libraries(Vic2ToHoi4ConverterTests LINK_PUBLIC Vic2ToHoi4lib) #### Coverage #### @@ -870,7 +955,6 @@ add_custom_target(gcov ) add_custom_command(TARGET gcov COMMAND echo "=================== GCOV ====================" - COMMAND gcov ${CMAKE_SOURCE_DIR}/src/Configuration.cpp ${CMAKE_SOURCE_DIR}/src/Vic2toHOI4Converter.cpp -o ${CMAKE_BINARY_DIR}/CMakeFiles/Vic2ToHoi4ConverterTests.dir/src COMMAND echo "-- Source directories:" COMMAND echo " ${CMAKE_SOURCE_DIR}/src/" COMMAND echo "-- Coverage files have been output to ${CMAKE_BINARY_DIR}/gcoverage" diff --git a/Vic2ToHoI4.sln b/Vic2ToHoI4.sln index 1d38da074c..62637e640a 100644 --- a/Vic2ToHoI4.sln +++ b/Vic2ToHoI4.sln @@ -5,13 +5,13 @@ VisualStudioVersion = 17.1.32407.343 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vic2ToHoI4", "Vic2ToHoI4.vcxproj", "{F5433A7A-723C-4E55-AC01-9D146820C7B4}" ProjectSection(ProjectDependencies) = postProject - {095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68} + {7EB32F98-C78D-43AF-A296-09492E80B1CB} = {7EB32F98-C78D-43AF-A296-09492E80B1CB} {D4E43E3D-E131-466D-9AA7-704C2298EACC} = {D4E43E3D-E131-466D-9AA7-704C2298EACC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vic2ToHoI4Tests", "Vic2ToHoI4Tests.vcxproj", "{A302CB0C-8DE3-4CBD-A974-282C1C7AE62D}" ProjectSection(ProjectDependencies) = postProject - {095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68} + {7EB32F98-C78D-43AF-A296-09492E80B1CB} = {7EB32F98-C78D-43AF-A296-09492E80B1CB} {D4E43E3D-E131-466D-9AA7-704C2298EACC} = {D4E43E3D-E131-466D-9AA7-704C2298EACC} EndProjectSection EndProject @@ -21,12 +21,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fronter", "external\Fronter EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "external\common_items\pch\pch.vcxproj", "{095FC941-B5E2-4439-88D9-587E2029CB68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItems", "external\common_items\CommonItems\CommonItems.vcxproj", "{3B8EC8C8-4066-46F7-851D-EB762C39C140}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vic2ToHoI4lib", "Vic2ToHoI4lib.vcxproj", "{7EB32F98-C78D-43AF-A296-09492E80B1CB}" ProjectSection(ProjectDependencies) = postProject + {095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68} {3B8EC8C8-4066-46F7-851D-EB762C39C140} = {3B8EC8C8-4066-46F7-851D-EB762C39C140} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItems", "external\common_items\CommonItems\CommonItems.vcxproj", "{3B8EC8C8-4066-46F7-851D-EB762C39C140}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|x64 = Release|x64 @@ -42,6 +45,8 @@ Global {095FC941-B5E2-4439-88D9-587E2029CB68}.Release|x64.Build.0 = Release|x64 {3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.ActiveCfg = Release|x64 {3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.Build.0 = Release|x64 + {7EB32F98-C78D-43AF-A296-09492E80B1CB}.Release|x64.ActiveCfg = Release|x64 + {7EB32F98-C78D-43AF-A296-09492E80B1CB}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Vic2ToHoI4.vcxproj b/Vic2ToHoI4.vcxproj index c507941322..80e5c2c4c9 100644 --- a/Vic2ToHoI4.vcxproj +++ b/Vic2ToHoI4.vcxproj @@ -34,6 +34,7 @@ false $(SolutionDir)\build\$(Configuration)\Vic2ToHoI4\ $(SolutionDir)\build\$(Configuration)Intermediate\ + true @@ -51,9 +52,9 @@ Console - false $(SolutionDir)lib - pch.lib;%(AdditionalDependencies) + Vic2toHoI4lib.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(TargetName).ilk tools\save_commit_id.bat @@ -63,830 +64,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Vic2ToHoI4.vcxproj.filters b/Vic2ToHoI4.vcxproj.filters index 4b1067ff66..955450c178 100644 --- a/Vic2ToHoI4.vcxproj.filters +++ b/Vic2ToHoI4.vcxproj.filters @@ -1,2474 +1,9 @@  - - src - src - - src - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\CountryCategories - - - src\HoI4World\CountryCategories - - - src\HoI4World\CountryCategories - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Diplomacy - - - src\HoI4World\Diplomacy - - - src\HoI4World\Diplomacy - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\GameRules - - - src\HoI4World\GameRules - - - src\HoI4World\GameRules - - - src\HoI4World\Ideas - - - src\HoI4World\Ideas - - - src\HoI4World\Ideas - - - src\HoI4World\Ideas - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\Leaders - - - src\HoI4World\Leaders - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\Modifiers - - - src\HoI4World\Modifiers - - - src\HoI4World\Names - - - src\HoI4World\Names - - - src\HoI4World\Names - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\OccupationLaws - - - src\HoI4World\OccupationLaws - - - src\HoI4World\OccupationLaws - - - src\HoI4World\Operations - - - src\HoI4World\Operations - - - src\HoI4World\Operations - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\Regions - - - src\HoI4World\Regions - - - src\HoI4World\Regions - - - src\HoI4World\ScriptedEffects - - - src\HoI4World\ScriptedEffects - - - src\HoI4World\ScriptedEffects - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedTriggers - - - src\HoI4World\ScriptedTriggers - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\WarCreator - - - src\HoI4World\WarCreator - - - src\HoI4World - - - src\HoI4World - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Maps - - - src\Maps - - - src\Maps - - - src\OutHoi4\AiStrategy - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\CountryCategories - - - src\OutHoi4\CountryCategories - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Diplomacy - - - src\OutHoi4\Events - - - src\OutHoi4\Events - - - src\OutHoi4\Events - - - src\OutHoi4\GameRules - - - src\OutHoi4\GameRules - - - src\OutHoi4\GameRules - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideologies - - - src\OutHoi4\Ideologies - - - src\OutHoi4\IntelligenceAgencies - - - src\OutHoi4\IntelligenceAgencies - - - src\OutHoi4\Interface - - - src\OutHoi4\Leaders - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\Operations - - - src\OutHoi4\Operations - - - src\OutHoi4\Operative - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\Sounds - - - src\OutHoi4\States - - - src\OutHoi4\States - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Localisations - - - src\V2World\Localisations - - - src\V2World\Map - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Politics - - - src\V2World\Politics - - - src\V2World\Pops - - - src\V2World\Pops - - - src\V2World\Provinces - - - src\V2World\Provinces - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\Stockpiles - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\World - - - src\V2World\World - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\V2World\Countries - - - src\HoI4World\Map - - - src\HoI4World\Countries - - - src\OutHoi4\Countries - - - src\HoI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HoI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HoI4World\PlaneDesigns - - - src\HoI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\OutHoi4\PeaceConference - - - src\HoI4World\PeaceConferences - - - src\OutHoi4\Countries - - - src\HoI4World\PeaceConferences - - - src\OutHoi4\PeaceConference - - - src\HoI4World\UnitMedals - - - src\OutHoi4\UnitMedals - - - src\HoI4World\PeaceConferences - - - src\HoI4World\FocusTrees - - - - - src - - - src - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\Characters - - - src\HoI4World\CountryCategories - - - src\HoI4World\CountryCategories - - - src\HoI4World\CountryCategories - - - src\HoI4World\CountryCategories - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Decisions - - - src\HoI4World\Diplomacy - - - src\HoI4World\Diplomacy - - - src\HoI4World\Diplomacy - - - src\HoI4World\Diplomacy - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\Events - - - src\HoI4World\GameRules - - - src\HoI4World\GameRules - - - src\HoI4World\GameRules - - - src\HoI4World\Ideas - - - src\HoI4World\Ideas - - - src\HoI4World\Ideas - - - src\HoI4World\Ideas - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\Ideologies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\IntelligenceAgencies - - - src\HoI4World\Leaders - - - src\HoI4World\Leaders - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations\ArticleRules - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Localisations - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\Military - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\MilitaryMappings - - - src\HoI4World\Modifiers - - - src\HoI4World\Modifiers - - - src\HoI4World\Names - - - src\HoI4World\Names - - - src\HoI4World\Names - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\Navies - - - src\HoI4World\OccupationLaws - - - src\HoI4World\OccupationLaws - - - src\HoI4World\OccupationLaws - - - src\HoI4World\OccupationLaws - - - src\HoI4World\Operations - - - src\HoI4World\Operations - - - src\HoI4World\Operations - - - src\HoI4World\Operations - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\OperativeNames - - - src\HoI4World\Operatives - - - src\HoI4World\Regions - - - src\HoI4World\Regions - - - src\HoI4World\Regions - - - src\HoI4World\Regions - - - src\HoI4World\ScriptedEffects - - - src\HoI4World\ScriptedEffects - - - src\HoI4World\ScriptedEffects - - - src\HoI4World\ScriptedEffects - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedLocalisations - - - src\HoI4World\ScriptedTriggers - - - src\HoI4World\ScriptedTriggers - - - src\HoI4World\ScriptedTriggers - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\ShipTypes - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\Sounds - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\States - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\TankDesigns - - - src\HoI4World\WarCreator - - - src\HoI4World\WarCreator - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\HoI4World - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Maps - - - src\Maps - - - src\Maps - - - src\OutHoi4\AiStrategy - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\CountryCategories - - - src\OutHoi4\CountryCategories - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Diplomacy - - - src\OutHoi4\Events - - - src\OutHoi4\Events - - - src\OutHoi4\Events - - - src\OutHoi4\GameRules - - - src\OutHoi4\GameRules - - - src\OutHoi4\GameRules - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideologies - - - src\OutHoi4\Ideologies - - - src\OutHoi4\IntelligenceAgencies - - - src\OutHoi4\IntelligenceAgencies - - - src\OutHoi4\Interface - - - src\OutHoi4\Leaders - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\Operations - - - src\OutHoi4\Operations - - - src\OutHoi4\Operative - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\Sounds - - - src\OutHoi4\States - - - src\OutHoi4\States - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Localisations - - - src\V2World\Localisations - - - src\V2World\Map - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Politics - - - src\V2World\Politics - - - src\V2World\Politics - - - src\V2World\Pops - - - src\V2World\Pops - - - src\V2World\Provinces - - - src\V2World\Provinces - - - src\V2World\Provinces - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\Stockpiles - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\World - - - src\V2World\World - - - src\V2World\World - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\HoI4World\Map - - - src\V2World\Culture - - - src\HoI4World\Countries - - - src\OutHoi4\Countries - - - src\HoI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HoI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HoI4World\PlaneDesigns - - - src\HoI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\OutHoi4\PeaceConference - - - src\HoI4World\PeaceConferences - - - src\HoI4World\Countries - - - src\OutHoi4\Countries - - - src\HoI4World\PeaceConferences - - - src\OutHoi4\PeaceConference - - - src\HoI4World\UnitMedals - - - src\OutHoi4\UnitMedals - - - src\HoI4World\PeaceConferences - - - src\HoI4World\FocusTrees - - - external\bitmap - - - src\HoI4World\Map - - - src\OutHoi4\Characters - @@ -2729,105 +264,6 @@ {f20b0ff2-6b7d-44a8-83d5-d0bc2c409ed1} - - {06343a74-7d90-43b6-b59d-52faeb06c727} - - - {d6d3ec70-7755-4527-b34c-9892bf4e39fc} - - - {cf12320e-a1e0-4962-8ae8-4ec9967dce47} - - - {00cbed4c-802e-4e69-b703-98ce76df2f33} - - - {95d3dad5-d5dc-418d-91d9-cf9094676d23} - - - {7708edf8-e180-4221-a3f9-82c2ee3d2a45} - - - {b6a36cbb-03a9-4068-a575-a170346687e6} - - - {be1afe26-af91-4af5-8313-d07f71bb040e} - - - {ec57f37c-447c-4418-955a-5f4da13fba54} - - - {c6868d56-2828-4eaf-a13e-620ffb162b8f} - - - {afb642d5-9d70-4d92-be79-320174f30872} - - - {faae13c1-c4eb-469c-a7fa-592adf568ee9} - - - {215cb181-1311-47d5-8df8-d065aff38988} - - - {7cf09a5b-290f-4175-b49d-e0163a77d20c} - - - {4a71a1f3-ccfb-4241-b7bd-2c001613abd8} - - - {2d5284c6-1088-4429-92f0-bf4b80aae3ac} - - - {07ed1757-0080-4b7a-a721-a8cf67dd5743} - - - {ac135a5b-ad78-4781-be6b-0dcc83e12c58} - - - {93527a59-0225-493a-8d39-f716005022b0} - - - {b5d0e1fa-29cd-4aa0-8d9c-cf9e4821e636} - - - {751e7f26-2a05-4f44-b80f-ef7c4b4ed515} - - - {ead0de51-f2a4-4539-adb9-dc3a77d7b4e1} - - - {281692fc-c6c1-48fe-aaa3-f5f811d87bce} - - - {df0f208b-fd0c-4cc4-ad9c-e0206f837871} - - - {b7321d48-682f-4f80-acc8-6d2bee2a0520} - - - {55fd769c-5da4-41d0-813f-ebea0c03e3a5} - - - {5e1b582e-c53f-4bd8-b821-19b76d115e79} - - - {4ce3bb5d-0dde-480b-92b5-ca4c6834c340} - - - {a31f93ac-87bf-4bae-b04b-08e755a9dd9f} - - - {a7cd1e4c-5263-481c-8531-ff8a325b9008} - - - {a2c4cb96-8c01-4827-b494-8e9ec034274e} - - - {0dcff956-8d0b-4264-bf47-199db845d9d2} - - - {bab5064c-c3b8-465c-80c8-be66b030e7c0} - {b7d0b467-df85-40eb-ba73-4228bb54dfca} @@ -2855,215 +291,5 @@ {062d2133-8d7f-45bc-9e42-30917afe65b0} - - {ddfa7886-4d1e-48ca-b41b-e7bccef52e91} - - - {b7994d3b-dde9-47e2-95cf-4d6580791ce8} - - - {741cf1b9-f712-4d33-931f-c05e49531de6} - - - {c85a272a-e224-4f1b-b4b4-067719769a1e} - - - {1ccfd884-83ad-4685-8eee-080c432b441f} - - - {5b1be6e8-0657-409a-ae7c-30ba6f096490} - - - {a7cef09a-5381-4dcb-add7-e5d9a6936383} - - - {f9aa6044-55e3-48c2-8129-ffae033b721a} - - - {419d36c5-463b-4339-b983-060bccdd40ec} - - - {b67a513b-5d2f-4dc1-af4c-ff2df727b75a} - - - {9f527931-44a6-4081-bc0e-592471bada9a} - - - {1a86eb83-8cbf-4a21-98b4-fd754c85df9b} - - - {cbc7b0a7-c497-4936-a3af-58a38c62c8b9} - - - {da56daa2-d9cd-44a2-9a91-b65e6bdbeb42} - - - {e49ea52f-965a-41d7-994d-6162adc0a4f0} - - - {0cbf8a19-fbf8-48c1-b762-677eb8458c16} - - - {6b65f25f-f639-4586-91e8-2c99bf30647f} - - - {1c3ff6bd-9b93-4369-84d3-25bb2e4afcf0} - - - {e527277e-2721-488b-8519-512b22f101e2} - - - {20ad3497-1fb4-458b-9f1f-c9d212bb5e56} - - - {04a22375-54d7-43a9-9188-7e835acb5447} - - - {a06f0205-b933-4a81-b937-3be9626148fd} - - - {8f454dc7-007f-4441-8ae0-9495195b8d0a} - - - {762af6f1-1fce-43e2-b05e-3c12b7ff93b0} - - - {1599b11f-b26a-41eb-8c54-0ac052bf06e7} - - - {ecd94c77-8758-49c6-ba98-7474862258f3} - - - {f2d11a44-19b3-44a5-b6ff-fd2958a276df} - - - {3ac8a5ab-1852-4ba9-85c4-1708bf9c3453} - - - {c9e397b2-cf20-4a78-aa65-03ad703f512c} - - - {7986d953-444c-4ffb-9f74-7c96865c8fec} - - - {daeb8ea1-0c08-4ea3-acad-9b1d44ca0bbd} - - - {bef769f5-92ea-4723-a503-db9ece456e59} - - - {f6e21fe6-3e9b-427f-811f-2dec9ea1e94d} - - - {09076910-f5d8-433a-be14-b7e727ba1c4c} - - - {a1a0716f-99e5-4829-a4f2-4357e7ea020b} - - - {9699145b-07cc-4352-a0bc-a46e8bb33254} - - - {2f49b50a-a858-46ca-912f-9bfd57e79395} - - - {1f0f1bf8-79cb-47a2-8c9b-18c8e1bf16e9} - - - {68dff936-c4b0-4156-923e-d4d95e491356} - - - {a25cbd78-c8e8-45de-984b-2974f7b29d68} - - - {8988b1ef-f7bd-4035-81d0-ad21a0ad4baf} - - - {3b2d9d61-876b-4291-8bb2-b13e711a5e95} - - - {2186a317-5755-4274-bccd-bdcc7d329b01} - - - {fc60af09-d233-4ca0-9906-a703ba916233} - - - {6267c31d-6f92-45b7-bb20-fa79706b8761} - - - {f8bdbc52-fee8-4e77-a616-80cf9fac8bf9} - - - {2d35930e-6feb-468c-80f7-89fcab02cc8c} - - - {b5e719fa-d8e2-409c-8209-ceb9cd6dae2b} - - - {1ea3410e-a36e-4902-89b4-39742c1e7460} - - - {4ba27e96-412f-447f-a601-07f2f192dacc} - - - {30b92f51-aee3-428e-84c6-61945e157db3} - - - {686d5b05-0b2a-49fa-aed8-8bba47c9d930} - - - {bf28bf21-63b6-48fa-a198-8a198c81a750} - - - {deb5fe2e-21c7-4a24-b445-c9fff44d71ff} - - - {04b017e0-6cef-4cb9-9ec0-af07c4edae30} - - - {4648b391-723b-4d3a-850e-af066d0ea3ef} - - - {e4d3608c-3d10-4d1f-bda1-7c9551f38d42} - - - {1d529996-0215-4c87-80d2-4ecb59a43082} - - - {9c45f394-cbc7-4611-8351-4a93cb464462} - - - {a5220532-6a20-4eb2-984f-cec3e0de670a} - - - {8276dfc4-2cf3-46b5-a077-4f3a79e8ce3c} - - - {f44a1c24-0149-40f1-9738-4a48685df1ff} - - - {71f96e42-7401-4ffe-9379-315b86b610ec} - - - {cde9c425-b0de-40ae-ae8f-9eacdbe5cb78} - - - {a03c7564-b48f-4b43-b0f8-75c29b30fcc5} - - - {6f292bfe-465e-4585-9766-4c20b9eed118} - - - {72c38416-0378-4fb2-b46c-b8bb8e2fbb9f} - - - {41e16a64-6290-4d89-b6e1-86bada413711} - - - {da53e026-99ce-4d15-a3f4-74aa08d90a4b} - - - {956eaec7-b39e-4efe-8c0c-58a049646b9a} - \ No newline at end of file diff --git a/Vic2ToHoI4Tests.vcxproj b/Vic2ToHoI4Tests.vcxproj index 3ddbc17c74..a0ba576538 100644 --- a/Vic2ToHoI4Tests.vcxproj +++ b/Vic2ToHoI4Tests.vcxproj @@ -24,586 +24,212 @@ $(SolutionDir)\build\tests\$(Configuration)\ $(SolutionDir)\build\tests\$(Configuration)-Intermediate\ + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -721,461 +347,6 @@ definition%(Extension) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1681,11 +852,11 @@ pch.h - false Console false $(SolutionDir)lib - pch.lib;%(AdditionalDependencies) + Vic2toHoI4lib.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(TargetName).ilk diff --git a/Vic2ToHoI4Tests.vcxproj.filters b/Vic2ToHoI4Tests.vcxproj.filters index fbaa7665ec..be20074084 100644 --- a/Vic2ToHoI4Tests.vcxproj.filters +++ b/Vic2ToHoI4Tests.vcxproj.filters @@ -1,291 +1,105 @@  - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\Characters - - - src\HOI4World\Characters - src\HOI4World\Characters - - src\HOI4World\CountryCategories - src\HOI4World\CountryCategories - - src\HOI4World\CountryCategories - - - src\HOI4World\CountryCategories - src\HOI4World\CountryCategories src\HOI4World\CountryCategories - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - src\HOI4World\Decisions - - src\HOI4World\Decisions - src\HOI4World\Decisions - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - src\HOI4World\Decisions src\HOI4World\Decisions - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - src\HOI4World\Decisions - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Diplomacy - - - src\HOI4World\Diplomacy - src\HOI4World\Diplomacy - - src\HOI4World\Diplomacy - src\HOI4World\Diplomacy - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - src\HOI4World\Events - - src\HOI4World\Events - - - src\HOI4World\Events - src\HOI4World\Events src\HOI4World\Events - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\GameRules - - - src\HOI4World\GameRules - src\HOI4World\GameRules - - src\HOI4World\GameRules - src\HOI4World\GameRules src\HOI4World\GameRules - - src\HOI4World\Ideas - - - src\HOI4World\Ideas - src\HOI4World\Ideas - - src\HOI4World\Ideas - src\HOI4World\Ideas - - src\HOI4World\Ideas - - - src\HOI4World\Ideologies - - - src\HOI4World\Ideologies - - - src\HOI4World\Ideologies - src\HOI4World\Ideologies - - src\HOI4World\Ideologies - src\HOI4World\Ideologies src\HOI4World\Ideologies - - src\HOI4World\IntelligenceAgencies - - - src\HOI4World\IntelligenceAgencies - - - src\HOI4World\IntelligenceAgencies - src\HOI4World\IntelligenceAgencies - - src\HOI4World\IntelligenceAgencies - src\HOI4World\IntelligenceAgencies - - src\HOI4World\Leaders - - - src\HOI4World\Leaders - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations\ArticleRules - src\HOI4World\Localisations\ArticleRules - - src\HOI4World\Localisations\ArticleRules - src\HOI4World\Localisations\ArticleRules @@ -295,225 +109,102 @@ src\HOI4World\Localisations\ArticleRules - - src\HOI4World\Localisations - src\HOI4World\Localisations - - src\HOI4World\Localisations - src\HOI4World\Localisations - - src\HOI4World\Localisations - - - src\HOI4World\Localisations - src\HOI4World\Localisations src\HOI4World\Localisations - - src\HOI4World\Localisations - src\HOI4World\Localisations - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - src\HOI4World\Map src\HOI4World\Map - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - src\HOI4World\Map - - src\HOI4World\Map - - - src\HOI4World\Military - - - src\HOI4World\Military - src\HOI4World\Military src\HOI4World\Military - - src\HOI4World\Military - src\HOI4World\Military - - src\HOI4World\Military - - - src\HOI4World\Military - src\HOI4World\Military src\HOI4World\Military - - src\HOI4World\MilitaryMappings - src\HOI4World\MilitaryMappings src\HOI4World\MilitaryMappings - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - src\HOI4World\MilitaryMappings - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - src\HOI4World\MilitaryMappings - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - src\HOI4World\MilitaryMappings src\HOI4World\MilitaryMappings - - src\HOI4World\MilitaryMappings - src\HOI4World\MilitaryMappings - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - src\HOI4World\MilitaryMappings src\HOI4World\MilitaryMappings - - src\HOI4World\Modifiers - src\HOI4World\Modifiers - - src\HOI4World\Modifiers - - - src\HOI4World\Names - src\HOI4World\Names - - src\HOI4World\Names - src\HOI4World\Names - - src\HOI4World\Names - src\HOI4World\Navies @@ -523,207 +214,87 @@ src\HOI4World\Navies - - src\HOI4World\Navies - src\HOI4World\Navies - - src\HOI4World\Navies - src\HOI4World\Navies src\HOI4World\Navies - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\OccupationLaws - src\HOI4World\OccupationLaws - - src\HOI4World\OccupationLaws - - - src\HOI4World\OccupationLaws - src\HOI4World\OccupationLaws src\HOI4World\OccupationLaws - - src\HOI4World\Operations - src\HOI4World\Operations - - src\HOI4World\Operations - - - src\HOI4World\Operations - src\HOI4World\Operations - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - src\HOI4World\OperativeNames - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - src\HOI4World\OperativeNames - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - src\HOI4World\OperativeNames src\HOI4World\OperativeNames - - src\HOI4World\Regions - - - src\HOI4World\Regions - - - src\HOI4World\Regions - src\HOI4World\Regions src\HOI4World\Regions - - src\HOI4World\ScriptedEffects - - - src\HOI4World\ScriptedEffects - src\HOI4World\ScriptedEffects - - src\HOI4World\ScriptedEffects - src\HOI4World\ScriptedEffects - + src\HOI4World\ScriptedLocalisations - + src\HOI4World\ScriptedLocalisations - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedTriggers - - - src\HOI4World\ScriptedTriggers - src\HOI4World\ScriptedTriggers - - src\HOI4World\ShipTypes - src\HOI4World\ShipTypes - - src\HOI4World\ShipTypes - src\HOI4World\ShipTypes - - src\HOI4World\ShipTypes - src\HOI4World\ShipTypes - - src\HOI4World\ShipTypes - src\HOI4World\ShipTypes - - src\HOI4World\ShipTypes - src\HOI4World\ShipTypes - - src\HOI4World\ShipTypes - src\HOI4World\ShipTypes - - src\HOI4World\Sounds - src\HOI4World\Sounds - - src\HOI4World\Sounds - src\HOI4World\Sounds - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - src\HOI4World\Sounds @@ -733,1007 +304,311 @@ src\HOI4World\Sounds - - src\HOI4World\States - - - src\HOI4World\States - src\HOI4World\States - - src\HOI4World\States - src\HOI4World\States - - src\HOI4World\States - - - src\HOI4World\States - src\HOI4World\States - - src\HOI4World\States - src\HOI4World\States - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - src\HOI4World\States src\HOI4World\States - - src\HOI4World\States - src\HOI4World\States - - src\HOI4World\TankDesigns - src\HOI4World\TankDesigns - - src\HOI4World\TankDesigns - - - src\HOI4World\TankDesigns - src\HOI4World\TankDesigns src\HOI4World\TankDesigns - - src\HOI4World\TankDesigns - src\HOI4World\TankDesigns - - src\HOI4World\TankDesigns - src\HOI4World\TankDesigns - - src\HOI4World\WarCreator - - - src\HOI4World\WarCreator - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - src\HOI4World - - src\Mappers\CasusBelli - src\Mappers\CasusBelli - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - src\Mappers\CasusBelli - - src\Mappers\Country - - - src\Mappers\Country - src\Mappers\Country - - src\Mappers\Country - src\Mappers\Country - - src\Mappers\CountryName - - - src\Mappers\CountryName - src\Mappers\CountryName - - src\Mappers\CountryName - src\Mappers\CountryName - - src\Mappers\FactionName - - - src\Mappers\FactionName - src\Mappers\FactionName - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - src\Mappers\FlagsToIdeas - - src\Mappers\FlagsToIdeas - src\Mappers\FlagsToIdeas - - src\Mappers\Government - - - src\Mappers\Government - src\Mappers\Government - - src\Mappers\Government - src\Mappers\Government - - src\Mappers\Graphics - src\Mappers\Graphics - - src\Mappers\Graphics - - - src\Mappers\Graphics - src\Mappers\Graphics - - src\Mappers\Graphics - src\Mappers\Graphics - - src\Mappers\Ideology - - - src\Mappers\Ideology - src\Mappers\Ideology - - src\Mappers\Ideology - src\Mappers\Ideology - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - src\Mappers\MergeRules src\Mappers\MergeRules - - src\Mappers\Provinces - src\Mappers\Provinces - - src\Mappers\Provinces - src\Mappers\Provinces - - src\Mappers\Provinces - src\Mappers\Provinces - - src\Mappers\Technology - src\Mappers\Technology - - src\Mappers\Technology - src\Mappers\Technology - - src\Mappers\Technology - src\Mappers\Technology - - src\Mappers\Technology - src\Mappers\Technology - - src\Maps - src\Maps - - src\Maps - src\Maps - - src\Maps - src\Maps - - src\OutHoi4\AiStrategy - - - src\OutHoi4\Characters - src\OutHoi4\Characters - - src\OutHoi4\Characters - src\OutHoi4\Characters - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - src\OutHoi4\Characters - - src\OutHoi4\Characters - src\OutHoi4\Characters - - src\OutHoi4\Characters - src\OutHoi4\Characters - - src\OutHoi4\CountryCategories - - - src\OutHoi4\CountryCategories + + src\OutHoi4\Map - - src\OutHoi4\Decisions + + src\OutHoi4\Map - - src\OutHoi4\Decisions + + src\V2World\Ai - - src\OutHoi4\Decisions + + src\V2World\Ai - - src\OutHoi4\Decisions + + src\V2World\Countries - - src\OutHoi4\Decisions + + src\V2World\Countries - - src\OutHoi4\Diplomacy + + src\V2World\Countries - - src\OutHoi4\Events + + src\V2World\Countries - - src\OutHoi4\Events + + src\V2World\Culture - - src\OutHoi4\Events + + src\V2World\Culture - - src\OutHoi4\GameRules + + src\V2World\Diplomacy - - src\OutHoi4\GameRules + + src\V2World\Diplomacy - - src\OutHoi4\GameRules + + src\V2World\Diplomacy - - src\OutHoi4\Ideas + + src\V2World\EU4ToVic2Data - - src\OutHoi4\Ideas + + src\V2World\EU4ToVic2Data - - src\OutHoi4\Ideas + + src\V2World\Issues - - src\OutHoi4\Ideologies + + src\V2World\Issues - - src\OutHoi4\Ideologies + + src\V2World\Issues - - src\OutHoi4\IntelligenceAgencies + + src\V2World\Issues - - src\OutHoi4\IntelligenceAgencies + + src\V2World\Localisations - - src\OutHoi4\Interface + + src\V2World\Map - - src\OutHoi4\Leaders + + src\V2World\Military\Leaders - - src\OutHoi4\Map + + src\V2World\Military\Leaders - - src\OutHoi4\Map + + src\V2World\Military\Leaders - - src\OutHoi4\Map + + src\V2World\Military\Leaders - - src\OutHoi4\Map + + src\V2World\Military - - src\OutHoi4\Map + + src\V2World\Military - - src\OutHoi4\Map + + src\V2World\Politics - - src\OutHoi4\Map + + src\V2World\Pops - - src\OutHoi4\Map + + src\V2World\Provinces - - src\OutHoi4\Map + + src\V2World\Provinces - - src\OutHoi4\Map + + src\V2World\Provinces - - src\OutHoi4\Map + + src\V2World\States - - src\OutHoi4\Military + + src\V2World\States - - src\OutHoi4\Military + + src\V2World\States - - src\OutHoi4\Military + + src\V2World\States - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\Operations - - - src\OutHoi4\Operations - - - src\OutHoi4\Operative - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\Sounds - - - src\OutHoi4\States - - - src\OutHoi4\States - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Localisations - - - src\V2World\Localisations - - - src\V2World\Localisations - - - src\V2World\Map - - - src\V2World\Map - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Politics + + src\V2World\States - - src\V2World\Politics + + src\V2World\Stockpiles - - src\V2World\Politics + + src\V2World\Technology - - src\V2World\Pops + + src\V2World\Wars - - src\V2World\Pops + + src\V2World\Wars - - src\V2World\Pops + + src - - src\V2World\Pops + + src\HOI4World\Leaders - - src\V2World\Provinces + + src\HOI4World\Countries - - src\V2World\Provinces + + src\HOI4World\PlaneDesigns - - src\V2World\Provinces + + src\HOI4World\PlaneDesigns - - src\V2World\Provinces + + src\HOI4World\PlaneDesigns - - src\V2World\Provinces + + src\HOI4World\PlaneDesigns - - src\V2World\States + + src\HOI4World\Countries - - src\V2World\States + + src\HOI4World\PeaceConferences - - src\V2World\States + + src\HOI4World\PeaceConferences - - src\V2World\States + + src\HOI4World\UnitMedals - - src\V2World\States + + external\googletest\googlemock\src - - src\V2World\States + + external\googletest\googletest\src - - src\V2World\States + + external\googletest\googletest\src - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\Stockpiles - - - src\V2World\Stockpiles - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\World - - - src\V2World\World - - - src\V2World\World - - - src - - - src - - - src - - - src\HOI4World\Leaders - - - src\V2World\Countries - - - src\HOI4World\Map - - - src\HOI4World\Countries - - - src\OutHoi4\Countries - - - src\HOI4World\Countries - - - src\HOI4World\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HOI4World\PeaceConferences - - - src\OutHoi4\PeaceConferences - - - src\OutHoi4\Countries - - - src\HOI4World\Countries - - - src\HOI4World\PeaceConferences - - - src\OutHoi4\PeaceConferences - - - src\HOI4World\PeaceConferences - - - src\HOI4World\PeaceConferences - - - src\HOI4World\UnitMedals - - - src\HOI4World\UnitMedals - - - src\OutHoi4\UnitMedals - - - src\HOI4World\PeaceConferences - - - src\HOI4World\FocusTrees - - - external\googletest\googlemock\src - - - external\googletest\googletest\src - - - external\googletest\googletest\src + + src\HOI4World\Navies @@ -2166,1367 +1041,6 @@ data\test_files\World - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\Characters - - - src\HOI4World\CountryCategories - - - src\HOI4World\CountryCategories - - - src\HOI4World\CountryCategories - - - src\HOI4World\CountryCategories - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Decisions - - - src\HOI4World\Diplomacy - - - src\HOI4World\Diplomacy - - - src\HOI4World\Diplomacy - - - src\HOI4World\Diplomacy - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\Events - - - src\HOI4World\GameRules - - - src\HOI4World\GameRules - - - src\HOI4World\GameRules - - - src\HOI4World\Ideas - - - src\HOI4World\Ideas - - - src\HOI4World\Ideas - - - src\HOI4World\Ideas - - - src\HOI4World\Ideologies - - - src\HOI4World\Ideologies - - - src\HOI4World\Ideologies - - - src\HOI4World\Ideologies - - - src\HOI4World\Ideologies - - - src\HOI4World\Ideologies - - - src\HOI4World\IntelligenceAgencies - - - src\HOI4World\IntelligenceAgencies - - - src\HOI4World\IntelligenceAgencies - - - src\HOI4World\IntelligenceAgencies - - - src\HOI4World\Leaders - - - src\HOI4World\Leaders - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations\ArticleRules - - - src\HOI4World\Localisations - - - src\HOI4World\Localisations - - - src\HOI4World\Localisations - - - src\HOI4World\Localisations - - - src\HOI4World\Localisations - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Map - - - src\HOI4World\Military - - - src\HOI4World\Military - - - src\HOI4World\Military - - - src\HOI4World\Military - - - src\HOI4World\Military - - - src\HOI4World\Military - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\MilitaryMappings - - - src\HOI4World\Modifiers - - - src\HOI4World\Modifiers - - - src\HOI4World\Names - - - src\HOI4World\Names - - - src\HOI4World\Names - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\Navies - - - src\HOI4World\OccupationLaws - - - src\HOI4World\OccupationLaws - - - src\HOI4World\OccupationLaws - - - src\HOI4World\OccupationLaws - - - src\HOI4World\Operations - - - src\HOI4World\Operations - - - src\HOI4World\Operations - - - src\HOI4World\Operations - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\OperativeNames - - - src\HOI4World\Operatives - - - src\HOI4World\Regions - - - src\HOI4World\Regions - - - src\HOI4World\Regions - - - src\HOI4World\Regions - - - src\HOI4World\ScriptedEffects - - - src\HOI4World\ScriptedEffects - - - src\HOI4World\ScriptedEffects - - - src\HOI4World\ScriptedEffects - - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedLocalisations - - - src\HOI4World\ScriptedTriggers - - - src\HOI4World\ScriptedTriggers - - - src\HOI4World\ScriptedTriggers - - - src\HOI4World\ShipTypes - - - src\HOI4World\ShipTypes - - - src\HOI4World\ShipTypes - - - src\HOI4World\ShipTypes - - - src\HOI4World\ShipTypes - - - src\HOI4World\ShipTypes - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\Sounds - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\States - - - src\HOI4World\TankDesigns - - - src\HOI4World\TankDesigns - - - src\HOI4World\TankDesigns - - - src\HOI4World\TankDesigns - - - src\HOI4World\TankDesigns - - - src\HOI4World\WarCreator - - - src\HOI4World\WarCreator - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\HOI4World - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\CasusBelli - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\Country - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\CountryName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FactionName - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\FlagsToIdeas - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Government - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Graphics - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\Ideology - - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - - - src\Mappers\MergeRules - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Provinces - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Mappers\Technology - - - src\Maps - - - src\Maps - - - src\Maps - - - src\OutHoi4\AiStrategy - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\Characters - - - src\OutHoi4\CountryCategories - - - src\OutHoi4\CountryCategories - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Decisions - - - src\OutHoi4\Diplomacy - - - src\OutHoi4\Events - - - src\OutHoi4\Events - - - src\OutHoi4\Events - - - src\OutHoi4\GameRules - - - src\OutHoi4\GameRules - - - src\OutHoi4\GameRules - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideas - - - src\OutHoi4\Ideologies - - - src\OutHoi4\Ideologies - - - src\OutHoi4\IntelligenceAgencies - - - src\OutHoi4\IntelligenceAgencies - - - src\OutHoi4\Interface - - - src\OutHoi4\Leaders - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Map - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Military - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Modifiers - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\Navies - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\OccupationLaws - - - src\OutHoi4\Operations - - - src\OutHoi4\Operations - - - src\OutHoi4\Operative - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\OperativeNames - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedEffects - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedLocalisations - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ScriptedTriggers - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\ShipTypes - - - src\OutHoi4\Sounds - - - src\OutHoi4\States - - - src\OutHoi4\States - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4\TankDesigns - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\OutHoi4 - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Ai - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Countries - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Culture - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\Diplomacy - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\EU4ToVic2Data - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Issues - - - src\V2World\Localisations - - - src\V2World\Localisations - - - src\V2World\Map - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military\Leaders - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Military - - - src\V2World\Politics - - - src\V2World\Politics - - - src\V2World\Politics - - - src\V2World\Pops - - - src\V2World\Pops - - - src\V2World\Provinces - - - src\V2World\Provinces - - - src\V2World\Provinces - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\States - - - src\V2World\Stockpiles - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Technology - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\Wars - - - src\V2World\World - - - src\V2World\World - - - src\V2World\World - - - src - - - src - - - src\HOI4World\Map - - - src\HOI4World\Countries - - - src\OutHoi4\Countries - - - src\HOI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\HOI4World\PlaneDesigns - - - src\OutHoi4\PlaneDesigns - - - src\HOI4World\PeaceConferences - - - src\OutHoi4\PeaceConferences - - - src\OutHoi4\Countries - - - src\HOI4World\Countries - - - src\HOI4World\PeaceConferences - - - src\OutHoi4\PeaceConferences - - - src\HOI4World\UnitMedals - - - src\OutHoi4\UnitMedals - - - src\HOI4World\PeaceConferences - - - src\HOI4World\FocusTrees - - data\test_files\Countries diff --git a/Vic2ToHoI4lib.vcxproj b/Vic2ToHoI4lib.vcxproj new file mode 100644 index 0000000000..81c4624934 --- /dev/null +++ b/Vic2ToHoI4lib.vcxproj @@ -0,0 +1,889 @@ + + + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 16.0 + Win32Proj + {7eb32f98-c78d-43af-a296-09492e80b1cb} + Vic2ToHoI4lib + 10.0 + + + + StaticLibrary + v143 + Unicode + + + + + + + + + + + + $(SolutionDir)lib\ + + + + NDEBUG;_LIB;%(PreprocessorDefinitions) + Use + pch.h + stdcpp20 + $(SolutionDir);$(SolutionDir)lib;$(SolutionDir)external\common_items\pch + OldStyle + true + $(SolutionDir)lib\pch.pch + $(SolutionDir)lib\common.pdb + pch.h + + + + + true + true + true + + + pch.lib;CommonItems.lib + + + $(SolutionDir)lib + + + + + + \ No newline at end of file diff --git a/Vic2ToHoI4lib.vcxproj.filters b/Vic2ToHoI4lib.vcxproj.filters new file mode 100644 index 0000000000..d5333956fc --- /dev/null +++ b/Vic2ToHoI4lib.vcxproj.filters @@ -0,0 +1,2784 @@ + + + + + {8ff833a5-f185-4118-bd14-92a1df682f6d} + + + {9807fa19-6f98-4996-b8ec-b5d2720bcc2a} + + + {5e88c6ec-35da-47d7-a72d-4bec8c3fd7ff} + + + {5ef1e770-27c0-40cc-8fb3-169f823f90f8} + + + {b5fd67c0-2303-4f7a-a898-c5fb9357ce7b} + + + {9a96be56-d91a-48fb-b365-aee5d02e5a22} + + + {04da965c-803d-4013-9c70-dbfeb92ec2e6} + + + {ee75a65d-be09-4b7e-84a9-f309c7fd4a11} + + + {ffe71ae1-c33f-4ba3-bfbd-ea9dd31f85df} + + + {372455ee-b7ca-4304-97d6-41084b8b08f0} + + + {20858508-58a5-4286-a11e-0067faa365e6} + + + {d8004c86-5d56-41de-8146-00b74a86699f} + + + {b69bfd18-a1a2-44f7-8d99-f0d194a2adb9} + + + {abf693ff-0c11-484a-94d2-b8b7df2185ff} + + + {3c5aac4c-f0b8-4c2f-bc7a-5dbcda5ae4fe} + + + {442bc9f1-cc64-4559-88a0-c14cd73e2402} + + + {503edfa4-2302-453c-8b75-002c3d58a227} + + + {0d688213-1e88-44cf-ab10-7668cb3adef3} + + + {4d3835e7-cf5b-48b3-af52-24810b761feb} + + + {ce675a46-e2df-4bba-8983-731ed7bd4f27} + + + {74896fcb-68a3-4e01-bdf6-b77da4706a39} + + + {eb519d1e-185f-4d84-9d0c-f6d4736ad751} + + + {b0c46dd0-e918-4886-9a37-371d946b2b5d} + + + {281e7e8b-09f6-4c73-ad57-3bbda082b099} + + + {6ae0ccc1-69d4-467f-93c7-cd3a27b3bb47} + + + {0d411f00-dc41-4130-b3a1-269de3d66b28} + + + {fef04999-ea5b-4273-94ea-984a008fbe19} + + + {a11c1d94-2d87-4d9a-9a64-98c5971fdd27} + + + {549edf68-d8b9-4473-b210-d153e6dde1b3} + + + {4c254218-d44d-449a-b030-7cdd3bfa09a7} + + + {e5203f63-0b56-4540-b458-58aae1c51476} + + + {28393830-a0f2-44b6-8492-973bc9e604cc} + + + {b931307b-2f00-4b6a-8507-eebd17ca16ae} + + + {24fec3ce-7f60-4572-81c0-e9849c8e64a1} + + + {da427580-eaf8-44e7-8fc2-a1d4a047556b} + + + {22dcb3fa-dff4-4219-9f38-5cfc542dea9f} + + + {4ad22919-0d0b-4831-a8ac-6c3e44d7d852} + + + {9feddc1e-1405-4fa1-a621-e25c09d2243e} + + + {28ae9c1c-676b-4268-a514-56bd497bdafd} + + + {3ed09edb-3a02-417c-9036-5cd1e2cc3ed9} + + + {a8018ea2-2b0b-4c35-ab4b-e0a00e1ef5a8} + + + {6cab88a5-d8b1-4e1b-bc8a-f30acc50ec94} + + + {0d80e3fb-2ff1-4393-b33c-b9fc36977ac2} + + + {bf11403d-2844-4ef4-89ce-4492a345fac4} + + + {4c0607a6-2491-4bf8-880a-f2492276c946} + + + {31239717-0955-4b4f-9bfc-71f9c5cd7859} + + + {c55e3dc1-3063-4ba0-8c48-be673e5b8773} + + + {c3491e95-cfe1-45a7-a61c-732600696139} + + + {9a257bd5-8190-4c09-829a-e5284f4cc563} + + + {045700d2-2aa9-4c10-8469-8af5b97653f5} + + + {e1e8d203-1d4d-49d8-8326-82f1f242bab4} + + + {4be8529d-c5e5-4dda-a140-6b158d6232f4} + + + {147f69a5-eedd-418c-846b-6e6c9e890651} + + + {21fa9766-f6f6-4cf7-b3fc-8f5ab7f0070f} + + + {57209a39-8004-458b-83b8-14ec6b715efd} + + + {10440e17-a445-4025-8824-1b4f64e0d1b0} + + + {df79bf73-1365-47bc-bcab-054c75609418} + + + {b3645fb8-a61e-4ad9-bb86-7c09b2b54b4d} + + + {aed22ec3-2ef6-4795-9953-c8b83f3a1fbb} + + + {99da0c42-b9e8-425d-9b6e-5decf81b9572} + + + {e8ece2d9-3fdc-4072-9f3d-e2af3b4ca9fc} + + + {5f3ed1b1-f75f-4a60-9005-2ef0af26c54a} + + + {b1335396-65ef-4f77-9cfe-df8856b692ac} + + + {1c2e5c72-c0ee-4110-8005-b54b02a7562a} + + + {11a657df-ab93-466f-8a6c-a434e39e23b6} + + + {d85095c4-c129-4f7c-824b-e1bd393c9598} + + + {40bc66b8-38d6-4f25-aae3-c92018a48c64} + + + {7b9dee1e-5609-4684-b134-2f583e20308e} + + + {5ab79076-9475-46e4-97f9-8b675936cde4} + + + {936cb6f5-154c-47a0-8773-84ab43f8c103} + + + {614be27f-9385-4440-a34e-dc2a184e69f0} + + + {24c72c11-c639-4be2-8308-206b8e42df90} + + + {b04be5d9-4df9-4afe-996f-aa469e8d91f3} + + + {05050f4b-4a65-4f55-84b9-95b214724e39} + + + {af16048d-ad83-48ff-ab24-75acf5aae709} + + + {61beaf1f-461b-499f-8576-33b1acf35192} + + + {9e4ae4bf-e11b-4269-8993-9b5550693937} + + + {ddc13ec3-aa7b-4c23-8d5b-075700ccfc13} + + + {06949417-9e81-4a37-8d83-54856c5f51c6} + + + {f5cc83c0-1305-4f3e-9542-4994afa06a3b} + + + {dff84700-ce56-494c-b8a4-0c132debe647} + + + {b95853e2-808a-4d89-96f0-9161124496b5} + + + {d3eb4db4-b96a-4681-9266-6379c9d8556a} + + + {191e0284-e2e7-4cef-bf21-e269491c48c5} + + + {986140aa-db58-49b4-a868-17c52fd4d354} + + + {8e9b6773-1783-4ee0-8532-3d6472791dbe} + + + {54c14b45-22cf-41a4-8f66-7de78c4b43ad} + + + {0ac293f8-3d5b-49c2-b510-a297850f4cef} + + + {ae1c13aa-4b95-44c5-ac22-e986e9191bc3} + + + {5d2590ae-8f8e-4e91-ae3e-f1805d519fdc} + + + {e85f4247-419c-4426-b8e8-70bb0e1f3fac} + + + {d4a6f73f-20da-4bf9-9769-e464311140c3} + + + {d067eea2-37b1-48ab-a366-19d5c1648738} + + + {ea693556-97a3-46cd-bb12-463915598f02} + + + {e9abf40e-074a-4159-98e9-a29da21fd476} + + + {df3fed7a-e0f2-4f5b-a1c9-0594fedca55d} + + + {7c295aeb-921f-4cc8-a1f7-03d2dce76a5b} + + + {fd2239cb-598d-4fdc-bbd0-be1e66a5e737} + + + {8dce3128-1f9b-4b2a-b9a5-d03a7dc58524} + + + {2672703a-ecd2-4bb5-9c4a-d2e29c85f2a9} + + + {510c392b-d0e5-45c7-9505-ba1b488a74a7} + + + {fb4f3e2a-d42d-4c3a-8735-87fd148ee1f1} + + + {0da4a951-7497-4bc9-b247-1d0aaa3539de} + + + {3b5bae8f-1a84-4852-b2b3-1024028d64d8} + + + + + src + + + src + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\CountryCategories + + + src\HoI4World\CountryCategories + + + src\HoI4World\CountryCategories + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Diplomacy + + + src\HoI4World\Diplomacy + + + src\HoI4World\Diplomacy + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\GameRules + + + src\HoI4World\GameRules + + + src\HoI4World\GameRules + + + src\HoI4World\Ideas + + + src\HoI4World\Ideas + + + src\HoI4World\Ideas + + + src\HoI4World\Ideas + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\Leaders + + + src\HoI4World\Leaders + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\Modifiers + + + src\HoI4World\Modifiers + + + src\HoI4World\Names + + + src\HoI4World\Names + + + src\HoI4World\Names + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\OccupationLaws + + + src\HoI4World\OccupationLaws + + + src\HoI4World\OccupationLaws + + + src\HoI4World\Operations + + + src\HoI4World\Operations + + + src\HoI4World\Operations + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\Regions + + + src\HoI4World\Regions + + + src\HoI4World\Regions + + + src\HoI4World\ScriptedEffects + + + src\HoI4World\ScriptedEffects + + + src\HoI4World\ScriptedEffects + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedTriggers + + + src\HoI4World\ScriptedTriggers + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\WarCreator + + + src\HoI4World\WarCreator + + + src\HoI4World\Countries + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PeaceConferences + + + src\HoI4World\PeaceConferences + + + src\HoI4World\PeaceConferences + + + src\HoI4World\UnitMedals + + + src\HoI4World\FocusTrees + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4\AiStrategy + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\CountryCategories + + + src\OutHoi4\CountryCategories + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Diplomacy + + + src\OutHoi4\Events + + + src\OutHoi4\Events + + + src\OutHoi4\Events + + + src\OutHoi4\GameRules + + + src\OutHoi4\GameRules + + + src\OutHoi4\GameRules + + + src\OutHoi4\Ideas + + + src\OutHoi4\Ideas + + + src\OutHoi4\Ideas + + + src\OutHoi4\Ideologies + + + src\OutHoi4\Ideologies + + + src\OutHoi4\IntelligenceAgencies + + + src\OutHoi4\IntelligenceAgencies + + + src\OutHoi4\Interface + + + src\OutHoi4\Leaders + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Modifiers + + + src\OutHoi4\Modifiers + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\OccupationLaws + + + src\OutHoi4\OccupationLaws + + + src\OutHoi4\Operations + + + src\OutHoi4\Operations + + + src\OutHoi4\Operative + + + src\OutHoi4\OperativeNames + + + src\OutHoi4\OperativeNames + + + src\OutHoi4\ScriptedEffects + + + src\OutHoi4\ScriptedEffects + + + src\OutHoi4\ScriptedLocalisations + + + src\OutHoi4\ScriptedLocalisations + + + src\OutHoi4\ScriptedTriggers + + + src\OutHoi4\ScriptedTriggers + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\Sounds + + + src\OutHoi4\States + + + src\OutHoi4\States + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\Countries + + + src\OutHoi4\Countries + + + src\OutHoi4\PlaneDesigns + + + src\OutHoi4\PlaneDesigns + + + src\OutHoi4\PlaneDesigns + + + src\OutHoi4\PeaceConference + + + src\OutHoi4\PeaceConference + + + src\OutHoi4\UnitMedals + + + src\Mappers\CasusBelli + + + src\Mappers\CasusBelli + + + src\Mappers\CasusBelli + + + src\Mappers\Country + + + src\Mappers\Country + + + src\Mappers\Country + + + src\Mappers\CountryName + + + src\Mappers\CountryName + + + src\Mappers\CountryName + + + src\Mappers\FactionName + + + src\Mappers\FactionName + + + src\Mappers\FactionName + + + src\Mappers\FlagsToIdeas + + + src\Mappers\FlagsToIdeas + + + src\Mappers\FlagsToIdeas + + + src\Mappers\Government + + + src\Mappers\Government + + + src\Mappers\Government + + + src\Mappers\Graphics + + + src\Mappers\Graphics + + + src\Mappers\Graphics + + + src\Mappers\Graphics + + + src\Mappers\Ideology + + + src\Mappers\Ideology + + + src\Mappers\Ideology + + + src\Mappers\MergeRules + + + src\Mappers\MergeRules + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Maps + + + src\Maps + + + src\Maps + + + src\V2World\Ai + + + src\V2World\Ai + + + src\V2World\Ai + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Culture + + + src\V2World\Culture + + + src\V2World\Culture + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\EU4ToVic2Data + + + src\V2World\EU4ToVic2Data + + + src\V2World\EU4ToVic2Data + + + src\V2World\Issues + + + src\V2World\Issues + + + src\V2World\Issues + + + src\V2World\Issues + + + src\V2World\Localisations + + + src\V2World\Localisations + + + src\V2World\Map + + + src\V2World\Military + + + src\V2World\Military + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Politics + + + src\V2World\Politics + + + src\V2World\Pops + + + src\V2World\Pops + + + src\V2World\Provinces + + + src\V2World\Provinces + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\Stockpiles + + + src\V2World\Technology + + + src\V2World\Technology + + + src\V2World\Technology + + + src\V2World\Wars + + + src\V2World\Wars + + + src\V2World\World + + + src\V2World\World + + + + + src + + + src + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\Characters + + + src\HoI4World\CountryCategories + + + src\HoI4World\CountryCategories + + + src\HoI4World\CountryCategories + + + src\HoI4World\CountryCategories + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Decisions + + + src\HoI4World\Diplomacy + + + src\HoI4World\Diplomacy + + + src\HoI4World\Diplomacy + + + src\HoI4World\Diplomacy + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\Events + + + src\HoI4World\GameRules + + + src\HoI4World\GameRules + + + src\HoI4World\GameRules + + + src\HoI4World\Ideas + + + src\HoI4World\Ideas + + + src\HoI4World\Ideas + + + src\HoI4World\Ideas + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\Ideologies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\IntelligenceAgencies + + + src\HoI4World\Leaders + + + src\HoI4World\Leaders + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Localisations\ArticleRules + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Map + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\Military + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\MilitaryMappings + + + src\HoI4World\Modifiers + + + src\HoI4World\Modifiers + + + src\HoI4World\Names + + + src\HoI4World\Names + + + src\HoI4World\Names + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\Navies + + + src\HoI4World\OccupationLaws + + + src\HoI4World\OccupationLaws + + + src\HoI4World\OccupationLaws + + + src\HoI4World\OccupationLaws + + + src\HoI4World\Operations + + + src\HoI4World\Operations + + + src\HoI4World\Operations + + + src\HoI4World\Operations + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\OperativeNames + + + src\HoI4World\Operatives + + + src\HoI4World\Regions + + + src\HoI4World\Regions + + + src\HoI4World\Regions + + + src\HoI4World\Regions + + + src\HoI4World\ScriptedEffects + + + src\HoI4World\ScriptedEffects + + + src\HoI4World\ScriptedEffects + + + src\HoI4World\ScriptedEffects + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedLocalisations + + + src\HoI4World\ScriptedTriggers + + + src\HoI4World\ScriptedTriggers + + + src\HoI4World\ScriptedTriggers + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\ShipTypes + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\Sounds + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\States + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\TankDesigns + + + src\HoI4World\WarCreator + + + src\HoI4World\WarCreator + + + src\HoI4World\Countries + + + src\HoI4World\Countries + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PlaneDesigns + + + src\HoI4World\PeaceConferences + + + src\HoI4World\PeaceConferences + + + src\HoI4World\PeaceConferences + + + src\HoI4World\UnitMedals + + + src\HoI4World\FocusTrees + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4 + + + src\OutHoi4\AiStrategy + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\Characters + + + src\OutHoi4\CountryCategories + + + src\OutHoi4\CountryCategories + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Decisions + + + src\OutHoi4\Diplomacy + + + src\OutHoi4\Events + + + src\OutHoi4\Events + + + src\OutHoi4\Events + + + src\OutHoi4\GameRules + + + src\OutHoi4\GameRules + + + src\OutHoi4\GameRules + + + src\OutHoi4\Ideas + + + src\OutHoi4\Ideas + + + src\OutHoi4\Ideas + + + src\OutHoi4\Ideologies + + + src\OutHoi4\Ideologies + + + src\OutHoi4\IntelligenceAgencies + + + src\OutHoi4\IntelligenceAgencies + + + src\OutHoi4\Interface + + + src\OutHoi4\Leaders + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Map + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Military + + + src\OutHoi4\Modifiers + + + src\OutHoi4\Modifiers + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\Navies + + + src\OutHoi4\OccupationLaws + + + src\OutHoi4\OccupationLaws + + + src\OutHoi4\Operations + + + src\OutHoi4\Operations + + + src\OutHoi4\Operative + + + src\OutHoi4\OperativeNames + + + src\OutHoi4\OperativeNames + + + src\OutHoi4\ScriptedEffects + + + src\OutHoi4\ScriptedEffects + + + src\OutHoi4\ScriptedLocalisations + + + src\OutHoi4\ScriptedLocalisations + + + src\OutHoi4\ScriptedTriggers + + + src\OutHoi4\ScriptedTriggers + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\ShipTypes + + + src\OutHoi4\Sounds + + + src\OutHoi4\States + + + src\OutHoi4\States + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\TankDesigns + + + src\OutHoi4\Countries + + + src\OutHoi4\Countries + + + src\OutHoi4\PlaneDesigns + + + src\OutHoi4\PlaneDesigns + + + src\OutHoi4\PlaneDesigns + + + src\OutHoi4\PeaceConference + + + src\OutHoi4\PeaceConference + + + src\OutHoi4\UnitMedals + + + src\Mappers\CasusBelli + + + src\Mappers\CasusBelli + + + src\Mappers\CasusBelli + + + src\Mappers\CasusBelli + + + src\Mappers\Country + + + src\Mappers\Country + + + src\Mappers\Country + + + src\Mappers\Country + + + src\Mappers\CountryName + + + src\Mappers\CountryName + + + src\Mappers\CountryName + + + src\Mappers\CountryName + + + src\Mappers\FactionName + + + src\Mappers\FactionName + + + src\Mappers\FactionName + + + src\Mappers\FactionName + + + src\Mappers\FlagsToIdeas + + + src\Mappers\FlagsToIdeas + + + src\Mappers\FlagsToIdeas + + + src\Mappers\FlagsToIdeas + + + src\Mappers\Government + + + src\Mappers\Government + + + src\Mappers\Government + + + src\Mappers\Government + + + src\Mappers\Government + + + src\Mappers\Graphics + + + src\Mappers\Graphics + + + src\Mappers\Graphics + + + src\Mappers\Graphics + + + src\Mappers\Graphics + + + src\Mappers\Ideology + + + src\Mappers\Ideology + + + src\Mappers\Ideology + + + src\Mappers\Ideology + + + src\Mappers\MergeRules + + + src\Mappers\MergeRules + + + src\Mappers\MergeRules + + + src\Mappers\MergeRules + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Provinces + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Mappers\Technology + + + src\Maps + + + src\Maps + + + src\Maps + + + src\V2World\Ai + + + src\V2World\Ai + + + src\V2World\Ai + + + src\V2World\Ai + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Countries + + + src\V2World\Culture + + + src\V2World\Culture + + + src\V2World\Culture + + + src\V2World\Culture + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\Diplomacy + + + src\V2World\EU4ToVic2Data + + + src\V2World\EU4ToVic2Data + + + src\V2World\EU4ToVic2Data + + + src\V2World\EU4ToVic2Data + + + src\V2World\EU4ToVic2Data + + + src\V2World\Issues + + + src\V2World\Issues + + + src\V2World\Issues + + + src\V2World\Issues + + + src\V2World\Issues + + + src\V2World\Localisations + + + src\V2World\Localisations + + + src\V2World\Map + + + src\V2World\Military + + + src\V2World\Military + + + src\V2World\Military + + + src\V2World\Military + + + src\V2World\Military + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Military\Leaders + + + src\V2World\Politics + + + src\V2World\Politics + + + src\V2World\Politics + + + src\V2World\Pops + + + src\V2World\Pops + + + src\V2World\Provinces + + + src\V2World\Provinces + + + src\V2World\Provinces + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\States + + + src\V2World\Stockpiles + + + src\V2World\Technology + + + src\V2World\Technology + + + src\V2World\Technology + + + src\V2World\Wars + + + src\V2World\Wars + + + src\V2World\Wars + + + src\V2World\Wars + + + src\V2World\World + + + src\V2World\World + + + src\V2World\World + + + external\bitmap + + + \ No newline at end of file diff --git a/Vic2ToHoI4lib.vcxproj.user b/Vic2ToHoI4lib.vcxproj.user new file mode 100644 index 0000000000..88a550947e --- /dev/null +++ b/Vic2ToHoI4lib.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/external/Fronter b/external/Fronter index b63713256c..edd2a1fa2c 160000 --- a/external/Fronter +++ b/external/Fronter @@ -1 +1 @@ -Subproject commit b63713256ce5f6691f1dc0ded16889332378f1d0 +Subproject commit edd2a1fa2c279ad0d613450021161baee444721f diff --git a/external/common_items b/external/common_items index 1a094841fd..1c405f5cef 160000 --- a/external/common_items +++ b/external/common_items @@ -1 +1 @@ -Subproject commit 1a094841fd4613c7b2d342802fbc58580e0c9e12 +Subproject commit 1c405f5cef32bd2ceb8429bdad9052e835d47467 diff --git a/tools/build_Vic2ToHoI4_release.sh b/tools/build_Vic2ToHoI4_release.sh old mode 100644 new mode 100755 index 2413753c27..49ae99ee8a --- a/tools/build_Vic2ToHoI4_release.sh +++ b/tools/build_Vic2ToHoI4_release.sh @@ -1,2 +1,10 @@ #!/bin/bash -cmake -H. -Bbuild/linux-intermediate && cmake --build ./build/linux-intermediate --target Vic2ToHoi4Converter Fronter Vic2ToHoi4ConverterTests -- -j40 && cd build/Release-LinuxTests && ./Vic2ToHoi4ConverterTests && cd .. +cmake -H. -Bbuild/linux-intermediate && +cmake --build ./build/linux-intermediate \ + --target Vic2ToHoi4Converter \ + ConverterFrontend \ + Vic2ToHoi4ConverterTests \ + -- -j40 && +cd build/Release-LinuxTests && +./Vic2ToHoi4ConverterTests && +cd .. diff --git a/tools/build_Vic2ToHoI4_release_foreign.sh b/tools/build_Vic2ToHoI4_release_foreign.sh old mode 100644 new mode 100755 diff --git a/tools/build_fronter.sh b/tools/build_fronter.sh old mode 100644 new mode 100755 diff --git a/tools/clang-format-all.sh b/tools/clang-format-all.sh old mode 100644 new mode 100755 diff --git a/tools/generate_coverage_report.sh b/tools/generate_coverage_report.sh old mode 100644 new mode 100755 diff --git a/tools/run_clang_tidy.sh b/tools/run_clang_tidy.sh old mode 100644 new mode 100755 index d3347ee30a..0a1659f4ef --- a/tools/run_clang_tidy.sh +++ b/tools/run_clang_tidy.sh @@ -1,3 +1,3 @@ #!/bin/bash #rm -rf build/ -cmake -H. -Bbuild && cmake --build ./build --target run_clang_tidy \ No newline at end of file +cmake -H. -Bbuild && cmake --build ./build --target run_clang_tidy -- -j40 \ No newline at end of file diff --git a/tools/run_linux_tests.sh b/tools/run_linux_tests.sh old mode 100644 new mode 100755