Skip to content

Commit 847268d

Browse files
author
Ivo Elezović
authored
Merge pull request #1 from Zemurin/init
Skeleton
2 parents 96d7bec + 9964030 commit 847268d

Some content is hidden

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

46 files changed

+10497
-33
lines changed

‎.clang-format‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
BasedOnStyle: Microsoft
2+
Language: Cpp
3+
4+
AccessModifierOffset: -1
5+
AlignAfterOpenBracket: DontAlign
6+
AllowAllArgumentsOnNextLine: false
7+
AllowAllConstructorInitializersOnNextLine: false
8+
AllowAllParametersOfDeclarationOnNextLine: false
9+
AllowShortBlocksOnASingleLine: false
10+
AllowShortCaseLabelsOnASingleLine: false
11+
AllowShortFunctionsOnASingleLine: InlineOnly
12+
AllowShortIfStatementsOnASingleLine: false
13+
AllowShortLambdasOnASingleLine: false
14+
AllowShortLoopsOnASingleLine: false
15+
AlwaysBreakAfterReturnType: None
16+
AlwaysBreakBeforeMultilineStrings: true
17+
BinPackArguments: false
18+
BinPackParameters: false
19+
BreakBeforeBraces: Allman
20+
BreakConstructorInitializers: AfterColon
21+
ColumnLimit: 160
22+
Cpp11BracedListStyle: true
23+
IndentCaseLabels: true
24+
IndentWidth: 3
25+
SortIncludes: false
26+
DerivePointerAlignment: false
27+
MaxEmptyLinesToKeep: 3
28+
PointerAlignment: Left
29+
SortIncludes: true
30+
SortUsingDeclarations: true
31+
SpaceBeforeAssignmentOperators: true
32+
SpaceBeforeCtorInitializerColon: false
33+
SpaceBeforeInheritanceColon: false
34+
SpaceBeforeRangeBasedForLoopColon: false
35+
TabWidth: 3
36+
UseTab: Always

‎.gitignore‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,6 @@
1-
# Prerequisites
2-
*.d
3-
4-
# Compiled Object files
5-
*.slo
6-
*.lo
7-
*.o
8-
*.obj
9-
10-
# Precompiled Headers
11-
*.gch
12-
*.pch
13-
14-
# Compiled Dynamic libraries
15-
*.so
16-
*.dylib
17-
*.dll
18-
19-
# Fortran module files
20-
*.mod
21-
*.smod
22-
23-
# Compiled Static libraries
24-
*.lai
25-
*.la
26-
*.a
27-
*.lib
28-
29-
# Executables
30-
*.exe
31-
*.out
32-
*.app
1+
Release/
2+
Debug/
3+
Analysis
4+
.vs/
5+
build/
6+
ProvinceMapper/log.txt

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "commonItems"]
2+
path = commonItems
3+
url = https://github.com/ParadoxGameConverters/commonItems
4+
[submodule "wxWidgets"]
5+
path = wxWidgets
6+
url = https://github.com/ParadoxGameConverters/wxWidgets

‎CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* @Zemurin
2+
* @Idhrendur

‎LICENSE‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Paradox Game Converters
3+
Copyright (c) 2020 The Paradox Game Converters Group
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22+
23+
---
24+
25+
Targa reader/writer code http://dmr.ath.cx/gfx/targa/
26+
27+
Copyright © 2001-2004 Emil Mikulic.
28+
29+
Source and binary redistribution of this code, with or without changes, for free or for profit, is allowed as long as this copyright notice is kept intact. Modified versions have to be clearly marked as modified.
30+
31+
This code is provided without any warranty. The copyright holder is not liable for anything bad that might happen as a result of the code.
32+
33+
---
34+
35+
Copyright 2020 The Paradox Game Converters Group
36+
37+
Licensed under the ImageMagick License (the "License"); you may not use
38+
this file except in compliance with the License. You may obtain a copy
39+
of the License at
40+
41+
https://imagemagick.org/script/license.php
42+
43+
Unless required by applicable law or agreed to in writing, software
44+
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
45+
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
46+
License for the specific language governing permissions and limitations
47+
under the License.

‎ProvinceMapper.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30011.22
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProvinceMapper", "ProvinceMapper.vcxproj", "{D4E43E3D-E131-466D-9AA7-704C2298EACC}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Release|x64 = Release|x64
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Debug|x64.ActiveCfg = Debug|x64
15+
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Debug|x64.Build.0 = Debug|x64
16+
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Release|x64.ActiveCfg = Release|x64
17+
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Release|x64.Build.0 = Release|x64
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {6866D4ED-94A3-49C9-B668-FF11F22ABADB}
24+
EndGlobalSection
25+
EndGlobal

‎ProvinceMapper.vcxproj‎

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|x64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>x64</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|x64">
9+
<Configuration>Release</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ClCompile Include="commonItems\CommonFunctions.cpp" />
15+
<ClCompile Include="commonItems\iconvlite.cpp" />
16+
<ClCompile Include="commonItems\Log.cpp" />
17+
<ClCompile Include="commonItems\OSCommonLayer.cpp" />
18+
<ClCompile Include="commonItems\Parser.cpp" />
19+
<ClCompile Include="commonItems\ParserHelpers.cpp" />
20+
<ClCompile Include="commonItems\StringUtils.cpp" />
21+
<ClCompile Include="commonItems\WinUtils.cpp" />
22+
<ClCompile Include="ProvinceMapper\Source\Definitions\Definitions.cpp" />
23+
<ClCompile Include="ProvinceMapper\Source\Frames\Images\ImageCanvas.cpp" />
24+
<ClCompile Include="ProvinceMapper\Source\Frames\Images\ImageFrame.cpp" />
25+
<ClCompile Include="ProvinceMapper\Source\Frames\Links\LinksFrame.cpp" />
26+
<ClCompile Include="ProvinceMapper\Source\Frames\Links\LinksTab.cpp" />
27+
<ClCompile Include="ProvinceMapper\Source\Frames\MainFrame.cpp" />
28+
<ClCompile Include="ProvinceMapper\Source\LinkMapper\LinkMapper.cpp" />
29+
<ClCompile Include="ProvinceMapper\Source\LinkMapper\LinkMapping.cpp" />
30+
<ClCompile Include="ProvinceMapper\Source\LinkMapper\LinkMappingVersion.cpp" />
31+
<ClCompile Include="ProvinceMapper\Source\ProvinceMapper.cpp" />
32+
<ClCompile Include="ProvinceMapper\Source\Provinces\Province.cpp" />
33+
</ItemGroup>
34+
<ItemGroup>
35+
<ClInclude Include="commonItems\CommonFunctions.h" />
36+
<ClInclude Include="commonItems\iconvlite.h" />
37+
<ClInclude Include="commonItems\Log.h" />
38+
<ClInclude Include="commonItems\OSCompatibilityLayer.h" />
39+
<ClInclude Include="commonItems\Parser.h" />
40+
<ClInclude Include="commonItems\ParserHelpers.h" />
41+
<ClInclude Include="commonItems\StringUtils.h" />
42+
<ClInclude Include="ProvinceMapper\Source\Definitions\Definitions.h" />
43+
<ClInclude Include="ProvinceMapper\Source\Frames\Images\ImageCanvas.h" />
44+
<ClInclude Include="ProvinceMapper\Source\Frames\Images\ImageFrame.h" />
45+
<ClInclude Include="ProvinceMapper\Source\Frames\Links\LinksFrame.h" />
46+
<ClInclude Include="ProvinceMapper\Source\Frames\Links\LinksTab.h" />
47+
<ClInclude Include="ProvinceMapper\Source\Frames\MainFrame.h" />
48+
<ClInclude Include="ProvinceMapper\Source\LinkMapper\LinkMapper.h" />
49+
<ClInclude Include="ProvinceMapper\Source\LinkMapper\LinkMapping.h" />
50+
<ClInclude Include="ProvinceMapper\Source\LinkMapper\LinkMappingVersion.h" />
51+
<ClInclude Include="ProvinceMapper\Source\ProvinceMapper.h" />
52+
<ClInclude Include="ProvinceMapper\Source\Provinces\Province.h" />
53+
</ItemGroup>
54+
<ItemGroup>
55+
<CopyFileToFolders Include="ProvinceMapper\Resources\converter.ico" />
56+
</ItemGroup>
57+
<ItemGroup>
58+
<CopyFileToFolders Include="ProvinceMapper\Resources\msvcp140_codecvt_ids.dll">
59+
<FileType>Document</FileType>
60+
</CopyFileToFolders>
61+
<CopyFileToFolders Include="ProvinceMapper\Resources\vcruntime140_1.dll">
62+
<FileType>Document</FileType>
63+
</CopyFileToFolders>
64+
<CopyFileToFolders Include="ProvinceMapper\Resources\VC_redist.x64.exe">
65+
<FileType>Document</FileType>
66+
</CopyFileToFolders>
67+
<CopyFileToFolders Include="wxWidgets\3.1.3\lib\vc14x_x64_dll\wxbase313u_vc14x_x64.dll">
68+
<FileType>Document</FileType>
69+
</CopyFileToFolders>
70+
<CopyFileToFolders Include="wxWidgets\3.1.3\lib\vc14x_x64_dll\wxmsw313u_core_vc14x_x64.dll">
71+
<FileType>Document</FileType>
72+
</CopyFileToFolders>
73+
</ItemGroup>
74+
<ItemGroup>
75+
<CopyFileToFolders Include="ProvinceMapper\Resources\test-mappings\test_mappings.txt" />
76+
</ItemGroup>
77+
<ItemGroup>
78+
<CopyFileToFolders Include="ProvinceMapper\Resources\test-to\provinces.bmp">
79+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-to</DestinationFolders>
80+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-to</DestinationFolders>
81+
</CopyFileToFolders>
82+
<CopyFileToFolders Include="ProvinceMapper\Resources\test-to\rivers.bmp">
83+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-to</DestinationFolders>
84+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-to</DestinationFolders>
85+
</CopyFileToFolders>
86+
</ItemGroup>
87+
<ItemGroup>
88+
<CopyFileToFolders Include="ProvinceMapper\Resources\test-from\provinces.bmp">
89+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-from</DestinationFolders>
90+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-from</DestinationFolders>
91+
</CopyFileToFolders>
92+
<CopyFileToFolders Include="ProvinceMapper\Resources\test-from\rivers.bmp">
93+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-from</DestinationFolders>
94+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-from</DestinationFolders>
95+
</CopyFileToFolders>
96+
</ItemGroup>
97+
<ItemGroup>
98+
<CopyFileToFolders Include="ProvinceMapper\Resources\test-from\definition.csv">
99+
<FileType>Document</FileType>
100+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-from</DestinationFolders>
101+
</CopyFileToFolders>
102+
<CopyFileToFolders Include="ProvinceMapper\Resources\test-to\definition.csv">
103+
<FileType>Document</FileType>
104+
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-to</DestinationFolders>
105+
</CopyFileToFolders>
106+
</ItemGroup>
107+
<PropertyGroup Label="Globals">
108+
<VCProjectVersion>16.0</VCProjectVersion>
109+
<ProjectGuid>{D4E43E3D-E131-466D-9AA7-704C2298EACC}</ProjectGuid>
110+
<Keyword>Win32Proj</Keyword>
111+
<RootNamespace>ProvinceMapper</RootNamespace>
112+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
113+
</PropertyGroup>
114+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
115+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
116+
<ConfigurationType>Application</ConfigurationType>
117+
<UseDebugLibraries>true</UseDebugLibraries>
118+
<PlatformToolset>v142</PlatformToolset>
119+
<CharacterSet>Unicode</CharacterSet>
120+
</PropertyGroup>
121+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
122+
<ConfigurationType>Application</ConfigurationType>
123+
<PlatformToolset>v142</PlatformToolset>
124+
<CharacterSet>Unicode</CharacterSet>
125+
</PropertyGroup>
126+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
127+
<ImportGroup Label="ExtensionSettings">
128+
</ImportGroup>
129+
<ImportGroup Label="Shared">
130+
</ImportGroup>
131+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
132+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
133+
<Import Project="wxWidgets\3.1.3\wxwidgets.props" />
134+
</ImportGroup>
135+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
136+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
137+
<Import Project="wxWidgets\3.1.3\wxwidgets.props" />
138+
</ImportGroup>
139+
<PropertyGroup Label="UserMacros" />
140+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
141+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
142+
</PropertyGroup>
143+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
144+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
145+
</PropertyGroup>
146+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
147+
<ClCompile>
148+
<PrecompiledHeader>
149+
</PrecompiledHeader>
150+
<PreprocessorDefinitions>WXUSINGDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151+
<LanguageStandard>stdcpp17</LanguageStandard>
152+
<AdditionalIncludeDirectories>$(ProjectDir)wxWidgets\3.1.3\include\msvc;$(ProjectDir)commonItems;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
153+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
154+
</ClCompile>
155+
<Link>
156+
<SubSystem>Windows</SubSystem>
157+
<AdditionalLibraryDirectories>$(ProjectDir)\wxWidgets\3.1.3\lib\vc14x_x64_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158+
</Link>
159+
<PostBuildEvent>
160+
<Command>
161+
</Command>
162+
</PostBuildEvent>
163+
</ItemDefinitionGroup>
164+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
165+
<ClCompile>
166+
<PrecompiledHeader>
167+
</PrecompiledHeader>
168+
<PreprocessorDefinitions>WXUSINGDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169+
<LanguageStandard>stdcpp17</LanguageStandard>
170+
<AdditionalIncludeDirectories>$(ProjectDir)ProvinceMapper\Source;$(ProjectDir)wxWidgets\3.1.3\include\msvc;$(ProjectDir)commonItems;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
172+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
173+
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
174+
<WholeProgramOptimization>true</WholeProgramOptimization>
175+
</ClCompile>
176+
<Link>
177+
<SubSystem>Windows</SubSystem>
178+
<AdditionalLibraryDirectories>$(ProjectDir)\wxWidgets\3.1.3\lib\vc14x_x64_dll;$(ProjectDir)imageMagick\lib-windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
179+
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
180+
</Link>
181+
<PostBuildEvent>
182+
<Command>
183+
</Command>
184+
</PostBuildEvent>
185+
</ItemDefinitionGroup>
186+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
187+
<ImportGroup Label="ExtensionTargets">
188+
</ImportGroup>
189+
</Project>

0 commit comments

Comments
 (0)