Skip to content

Commit

Permalink
Merge pull request #1 from Zemurin/init
Browse files Browse the repository at this point in the history
Skeleton
  • Loading branch information
Ivo Elezović authored Oct 15, 2020
2 parents 96d7bec + 9964030 commit 847268d
Show file tree
Hide file tree
Showing 46 changed files with 10,497 additions and 33 deletions.
36 changes: 36 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
BasedOnStyle: Microsoft
Language: Cpp

AccessModifierOffset: -1
AlignAfterOpenBracket: DontAlign
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: InlineOnly
AllowShortIfStatementsOnASingleLine: false
AllowShortLambdasOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
BinPackArguments: false
BinPackParameters: false
BreakBeforeBraces: Allman
BreakConstructorInitializers: AfterColon
ColumnLimit: 160
Cpp11BracedListStyle: true
IndentCaseLabels: true
IndentWidth: 3
SortIncludes: false
DerivePointerAlignment: false
MaxEmptyLinesToKeep: 3
PointerAlignment: Left
SortIncludes: true
SortUsingDeclarations: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCtorInitializerColon: false
SpaceBeforeInheritanceColon: false
SpaceBeforeRangeBasedForLoopColon: false
TabWidth: 3
UseTab: Always
38 changes: 6 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,6 @@
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app
Release/
Debug/
Analysis
.vs/
build/
ProvinceMapper/log.txt
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "commonItems"]
path = commonItems
url = https://github.com/ParadoxGameConverters/commonItems
[submodule "wxWidgets"]
path = wxWidgets
url = https://github.com/ParadoxGameConverters/wxWidgets
2 changes: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* @Zemurin
* @Idhrendur
28 changes: 27 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Paradox Game Converters
Copyright (c) 2020 The Paradox Game Converters Group

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,3 +19,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

---

Targa reader/writer code http://dmr.ath.cx/gfx/targa/

Copyright © 2001-2004 Emil Mikulic.

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.

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.

---

Copyright 2020 The Paradox Game Converters Group

Licensed under the ImageMagick License (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy
of the License at

https://imagemagick.org/script/license.php

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
25 changes: 25 additions & 0 deletions ProvinceMapper.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProvinceMapper", "ProvinceMapper.vcxproj", "{D4E43E3D-E131-466D-9AA7-704C2298EACC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Debug|x64.ActiveCfg = Debug|x64
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Debug|x64.Build.0 = Debug|x64
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Release|x64.ActiveCfg = Release|x64
{D4E43E3D-E131-466D-9AA7-704C2298EACC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6866D4ED-94A3-49C9-B668-FF11F22ABADB}
EndGlobalSection
EndGlobal
189 changes: 189 additions & 0 deletions ProvinceMapper.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="commonItems\CommonFunctions.cpp" />
<ClCompile Include="commonItems\iconvlite.cpp" />
<ClCompile Include="commonItems\Log.cpp" />
<ClCompile Include="commonItems\OSCommonLayer.cpp" />
<ClCompile Include="commonItems\Parser.cpp" />
<ClCompile Include="commonItems\ParserHelpers.cpp" />
<ClCompile Include="commonItems\StringUtils.cpp" />
<ClCompile Include="commonItems\WinUtils.cpp" />
<ClCompile Include="ProvinceMapper\Source\Definitions\Definitions.cpp" />
<ClCompile Include="ProvinceMapper\Source\Frames\Images\ImageCanvas.cpp" />
<ClCompile Include="ProvinceMapper\Source\Frames\Images\ImageFrame.cpp" />
<ClCompile Include="ProvinceMapper\Source\Frames\Links\LinksFrame.cpp" />
<ClCompile Include="ProvinceMapper\Source\Frames\Links\LinksTab.cpp" />
<ClCompile Include="ProvinceMapper\Source\Frames\MainFrame.cpp" />
<ClCompile Include="ProvinceMapper\Source\LinkMapper\LinkMapper.cpp" />
<ClCompile Include="ProvinceMapper\Source\LinkMapper\LinkMapping.cpp" />
<ClCompile Include="ProvinceMapper\Source\LinkMapper\LinkMappingVersion.cpp" />
<ClCompile Include="ProvinceMapper\Source\ProvinceMapper.cpp" />
<ClCompile Include="ProvinceMapper\Source\Provinces\Province.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="commonItems\CommonFunctions.h" />
<ClInclude Include="commonItems\iconvlite.h" />
<ClInclude Include="commonItems\Log.h" />
<ClInclude Include="commonItems\OSCompatibilityLayer.h" />
<ClInclude Include="commonItems\Parser.h" />
<ClInclude Include="commonItems\ParserHelpers.h" />
<ClInclude Include="commonItems\StringUtils.h" />
<ClInclude Include="ProvinceMapper\Source\Definitions\Definitions.h" />
<ClInclude Include="ProvinceMapper\Source\Frames\Images\ImageCanvas.h" />
<ClInclude Include="ProvinceMapper\Source\Frames\Images\ImageFrame.h" />
<ClInclude Include="ProvinceMapper\Source\Frames\Links\LinksFrame.h" />
<ClInclude Include="ProvinceMapper\Source\Frames\Links\LinksTab.h" />
<ClInclude Include="ProvinceMapper\Source\Frames\MainFrame.h" />
<ClInclude Include="ProvinceMapper\Source\LinkMapper\LinkMapper.h" />
<ClInclude Include="ProvinceMapper\Source\LinkMapper\LinkMapping.h" />
<ClInclude Include="ProvinceMapper\Source\LinkMapper\LinkMappingVersion.h" />
<ClInclude Include="ProvinceMapper\Source\ProvinceMapper.h" />
<ClInclude Include="ProvinceMapper\Source\Provinces\Province.h" />
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="ProvinceMapper\Resources\converter.ico" />
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="ProvinceMapper\Resources\msvcp140_codecvt_ids.dll">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="ProvinceMapper\Resources\vcruntime140_1.dll">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="ProvinceMapper\Resources\VC_redist.x64.exe">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="wxWidgets\3.1.3\lib\vc14x_x64_dll\wxbase313u_vc14x_x64.dll">
<FileType>Document</FileType>
</CopyFileToFolders>
<CopyFileToFolders Include="wxWidgets\3.1.3\lib\vc14x_x64_dll\wxmsw313u_core_vc14x_x64.dll">
<FileType>Document</FileType>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="ProvinceMapper\Resources\test-mappings\test_mappings.txt" />
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="ProvinceMapper\Resources\test-to\provinces.bmp">
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-to</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-to</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="ProvinceMapper\Resources\test-to\rivers.bmp">
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-to</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-to</DestinationFolders>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="ProvinceMapper\Resources\test-from\provinces.bmp">
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-from</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-from</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="ProvinceMapper\Resources\test-from\rivers.bmp">
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-from</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/test-from</DestinationFolders>
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="ProvinceMapper\Resources\test-from\definition.csv">
<FileType>Document</FileType>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-from</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="ProvinceMapper\Resources\test-to\definition.csv">
<FileType>Document</FileType>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)test-to</DestinationFolders>
</CopyFileToFolders>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{D4E43E3D-E131-466D-9AA7-704C2298EACC}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ProvinceMapper</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="wxWidgets\3.1.3\wxwidgets.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="wxWidgets\3.1.3\wxwidgets.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<PreprocessorDefinitions>WXUSINGDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>$(ProjectDir)wxWidgets\3.1.3\include\msvc;$(ProjectDir)commonItems;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(ProjectDir)\wxWidgets\3.1.3\lib\vc14x_x64_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<PreprocessorDefinitions>WXUSINGDLL;_CRT_SECURE_NO_WARNINGS;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>$(ProjectDir)ProvinceMapper\Source;$(ProjectDir)wxWidgets\3.1.3\include\msvc;$(ProjectDir)commonItems;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(ProjectDir)\wxWidgets\3.1.3\lib\vc14x_x64_dll;$(ProjectDir)imageMagick\lib-windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading

0 comments on commit 847268d

Please sign in to comment.