Merge branch 'master' into ProvinceMapper

.gitattributes

@@ -0,0 +1,24 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.h text
+*.txt text
+*.xml text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+*.bat text eol=crlf
+*.vcxproj* text eol=crlf
+
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf
+*.md text eol=lf
+*.yml text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.tga binary

.gitignore

@@ -1,6 +1,29 @@
+CK2ToEU3/build/
 Release/
 ReleaseIntermediate/
-bin/
-obj/
-EU3ToV2
-*.sdf
+Release-Linux/
+Debug/
+DebugIntermediate/
+testResults
+*testResults*
+V2ToHoI3.zip
+*.opensdf
+*.opendb
+*.sdf
+*.VC.db
+/EU4toV2/.vs/EU4ToV2/v14/.suo
+/Vic2ToHoI4/.vs/Supercharger/Vic2ToHoI4/codemap.dat
+/Vic2ToHoI4/.vs/Supercharger/Vic2ToHoI4/global_history.dat
+/Vic2ToHoI4/.vs/Supercharger/Vic2ToHoI4/workbench.dat
+/Vic2ToHoI4/.vs/Vic2ToHoI4/v14/.suo
+/Vic2ToHoI4/.vs/
+/EU4toV2/.vs/Supercharger/EU4ToV2/codemap.dat
+/EU4toV2/.vs/Supercharger/EU4ToV2/global_history.dat
+/EU4toV2/.vs/Supercharger/EU4ToV2/workbench.dat
+/EU4toV2/.vs/
+/EU4toV2/build
+/Vic2ToHoI4/build
+/EU4toV2/EU4toV2Converter.pdb
+/EU4toV2/log.txt
+/EU4toV2/Woxolo.eu4
+/EU4toV2/EU4toV2Converter.iobj

.travis.yml

@@ -0,0 +1,37 @@
+dist: trusty
+sudo: required
+language:
+  - cpp
+compiler:
+  - gcc
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - gcc-7
+      - g++-7
+      - cmake
+      - cmake-data
+      - libboost1.55-all-dev
+before_install:
+  - mkdir $HOME/usr
+  - export PATH="$HOME/usr/bin:$PATH"
+  - wget https://cmake.org/files/v3.10/cmake-3.10.0-rc1-Linux-x86_64.sh
+  - chmod +x cmake-3.10.0-rc1-Linux-x86_64.sh
+  - ./cmake-3.10.0-rc1-Linux-x86_64.sh --prefix=$HOME/usr --exclude-subdir --skip-license
+script:
+  # Export CC and CXX to tell cmake which compiler to use
+  - export CC=/usr/bin/gcc-7
+  - export CXX=/usr/bin/g++-7
+  # Check versions of gcc, g++ and cmake
+  - gcc -v && g++ -v && cmake --version
+  # Run your build commands next
+  - cd Vic2ToHoI4
+  - cmake -H. -Bbuild
+  - ls
+  - ls build
+  - cmake --build ./build
+  - cd ../EU4toV2
+  - cmake -H. -Bbuild
+  - cmake --build ./build -- -j3