Merge branch 'develop'

Author: nnarain

.travis.yml

@@ -19,7 +19,7 @@ install:
 
 script:
 - mkdir build && cd build
-- cmake .. -DBUILD_EXAMPLE="OFF" -DBUILD_DOCS="ON"
+- cmake .. -DBUILD_EXAMPLE="OFF" -DBUILD_DOCS="ON" -DCMAKE_BUILD_TYPE=Release
 - make && make check
 - cd ..
 

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 nnarain
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+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.

appveyor.yml

@@ -8,29 +8,28 @@ os: Visual Studio 2015
 clone_folder: c:\projects\gameboycore
 
 environment:
-  GTEST_ROOT: c:\libs\googletest
+  VCPKG_TOOLCHAIN: c:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake
+
+configuration:
+  - Release
 
 install:
-  - echo "Installing Google Test"
-  - git clone --depth=1 https://github.com/google/googletest.git c:\tmp\googletest
-  - cd c:\tmp\googletest
-  - mkdir build && cd build
-  - cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=c:\libs\googletest
-  - msbuild googletest-distribution.sln /verbosity:quiet
-  - msbuild INSTALL.vcxproj /verbosity:quiet
-  - set PATH=%PATH%;%GTEST_ROOT%\lib
+  - cd c:\tools\vcpkg
+  - vcpkg install gtest
+  - vcpkg integrate install
 
 before_build:
   - cd c:\projects\gameboycore
   - mkdir build && cd build
-  - cmake .. -DBUILD_EXAMPLE="OFF" -DBUILD_DOCS="OFF"
+  - cmake .. -DBUILD_TESTS="ON" -DBUILD_EXAMPLE="OFF" -DBUILD_DOCS="OFF" -DCMAKE_TOOLCHAIN_FILE=%VCPKG_TOOLCHAIN%
 
 build:
   project: c:\projects\gameboycore\build\gameboycore.sln
   verbosity: minimal
 
 after_build:
-  - C:\projects\gameboycore\build\tests\Debug\gameboy_tests.exe
+  - cd C:\projects\gameboycore\build
+  - cmake --build . --target check
   - msbuild C:\projects\gameboycore\build\PACKAGE.vcxproj /verbosity:quiet
 
 artifacts: