Add emulator configuration (#67)

.travis.yml

@@ -1,26 +1,29 @@
+
+
 language: cpp
 matrix:
   include:
     - env: NAME="linux gcc"
       os: linux
-      dist: xenial
+      dist: bionic
       compiler: gcc
       sudo: required
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-7
+            - g++-8
             - cmake
             - qtbase5-dev
             - qtbase5-dev-tools
+            - libsdl2-dev
       before_script:
         - mkdir build
         - cd build
-        - export CC=gcc-7
-        - export CXX=g++-7
-        - cmake .. -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_C_COMPILER=gcc-7
+        - export CC=gcc-8
+        - export CXX=g++-8
+        - cmake .. -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_C_COMPILER=gcc-8
       script:
         - make
         - make install

CMakeLists.txt

@@ -8,8 +8,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul
 
 set(CMAKE_INSTALL_MESSAGE LAZY)
 
-add_compile_definitions(NOMINMAX)
-include(CompilerWarnings)
+add_compile_definitions(NOMINMAX _WINSOCKAPI_ _SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING)
+include(CompilerFlags)
 
 # Generate revision information
 include(GetGitRevisionDescription)

CMakeModules/CompilerWarnings.cmake → CMakeModules/CompilerFlags.cmake

@@ -1,7 +1,4 @@
-set(GCC_WERROR "-Werror")
-set(MSVC_WERROR "/Wx")
-
-set(GCC_WARNINGS
+set(GCC_FLAGS
         -Wall
         -Wextra
         -Wno-attributes
@@ -23,9 +20,9 @@ set(GCC_WARNINGS
         #-Wsuggest-override
         -Wno-switch)
 
-set(MSVC_WARNINGS
+set(MSVC_FLAGS
         /permissive
-        /W4
+        /W3
         /w14640
         /w14242
         /w14254
@@ -45,12 +42,8 @@ set(MSVC_WARNINGS
         /w14826
         /w14928)
 
-option(ENABLE_WARNINGS "Enable warnings" ON)
-
-if(ENABLE_WARNINGS)
-    if(MSVC)
-        add_compile_options(${MSVC_WARNINGS})
-    else(MSVC)
-        add_compile_options(${GCC_WARNINGS})
-    endif(MSVC)
-endif(ENABLE_WARNINGS)
+if(MSVC)
+    set(ADDITIONAL_CXXFLAGS ${MSVC_FLAGS})
+else()
+    set(ADDITIONAL_CXXFLAGS ${GCC_FLAGS})
+endif()

CMakeModules/SDL2_finder.cmake

@@ -0,0 +1,29 @@
+if(WIN32)
+    include(FetchContent)
+    FetchContent_Declare(
+            sdl2_bin_win32
+            URL "https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip")
+endif()
+
+function(requires_sdl2)
+    find_package(SDL2)
+    if(NOT SDL_FOUND)
+        if(WIN32)
+            # Download SDL2 binaries
+            include(FetchContent)
+            FetchContent_Declare(
+                    sdl2_bin_win32
+                    URL "https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip")
+            FetchContent_GetProperties(sdl2_bin_win32)
+            if(NOT ${sdl2_bin_win32_POPULATED})
+                FetchContent_Populate(sdl2_bin_win32)
+            endif()
+            # Manually set paths
+            message("Using downloaded SDL2 win32 binaries")
+            set(SDL2_INCLUDE_DIR "${sdl2_bin_win32_SOURCE_DIR}/include")
+            set(SDL2_LIBRARY_RELEASE "${sdl2_bin_win32_SOURCE_DIR}/lib/x86/SDL2.lib")
+            set(SDL2main_LIBRARIES "${sdl2_bin_win32_SOURCE_DIR}/lib/x86/SDL2main.lib")
+        endif()
+    endif()
+    find_package(SDL2 REQUIRED)
+endfunction()

externals/cmake-modules/FindSDL2.cmake

@@ -0,0 +1,130 @@
+# Licensed under the ISC license. Please see the LICENSE.md file for details.
+# Copyright (c) 2019 Sandro Stikić <https://github.com/opeik>
+
+#[[============================================================================
+FindSDL2
+---------
+
+Try to find SDL2.
+
+This module defines the following IMPORTED targets:
+- SDL2::Core — Libraries should link against this.
+- SDL2::SDL2 — Applications should link against this instead of SDL2::Core.
+
+This module defines the following variables:
+- SDL2_FOUND
+- SDL2main_FOUND
+- SDL2_VERSION_STRING
+- SDL2_LIBRARIES (deprecated)
+- SDL2_INCLUDE_DIRS (deprecated)
+#============================================================================]]
+
+# Look for SDL2.
+find_path(SDL2_INCLUDE_DIR SDL.h
+    PATH_SUFFIXES SDL2 include/SDL2 include
+    PATHS ${SDL2_PATH}
+)
+
+if (NOT SDL2_LIBRARIES)
+    # Determine architecture.
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(_SDL2_PATH_SUFFIX lib/x64)
+    else()
+        set(_SDL2_PATH_SUFFIX lib/x86)
+    endif()
+
+    # Look for the release version of SDL2.
+    find_library(SDL2_LIBRARY_RELEASE
+        NAMES SDL2 SDL-2.0
+        PATH_SUFFIXES lib ${_SDL2_PATH_SUFFIX}
+        PATHS ${SDL2_PATH}
+    )
+
+    # Look for the debug version of SDL2.
+    find_library(SDL2_LIBRARY_DEBUG
+        NAMES SDL2d
+        PATH_SUFFIXES lib ${_SDL2_PATH_SUFFIX}
+        PATHS ${SDL2_PATH}
+    )
+
+    # Look for SDL2main.
+    find_library(SDL2main_LIBRARIES
+        NAMES SDL2main
+        PATH_SUFFIXES lib ${_SDL2_PATH_SUFFIX}
+        PATHS ${SDL2_PATH}
+    )
+
+    include(SelectLibraryConfigurations)
+    select_library_configurations(SDL2)
+endif()
+
+# Find the SDL2 version.
+if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
+    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
+    string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
+    set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH})
+    unset(SDL2_VERSION_MAJOR_LINE)
+    unset(SDL2_VERSION_MINOR_LINE)
+    unset(SDL2_VERSION_PATCH_LINE)
+    unset(SDL2_VERSION_MAJOR)
+    unset(SDL2_VERSION_MINOR)
+    unset(SDL2_VERSION_PATCH)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SDL2
+    REQUIRED_VARS SDL2_LIBRARIES SDL2_INCLUDE_DIR
+    VERSION_VAR SDL2_VERSION_STRING)
+
+find_package_handle_standard_args(SDL2main
+    REQUIRED_VARS SDL2main_LIBRARIES SDL2_INCLUDE_DIR
+    VERSION_VAR SDL2_VERSION_STRING)
+
+if(SDL2_FOUND)
+    set(SDL2_LIBRARIES ${SDL2_LIBRARY})
+    set(SDL2_INCLUDE_DIR ${SDL2_INCLUDE_DIR})
+
+    # Define the core SDL2 target.
+    if(NOT TARGET SDL2::Core)
+        add_library(SDL2::Core UNKNOWN IMPORTED)
+        set_target_properties(SDL2::Core PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES ${SDL2_INCLUDE_DIR})
+
+        # Link against Cocoa on macOS.
+        if(APPLE)
+            set_property(TARGET SDL2::Core APPEND PROPERTY
+              INTERFACE_LINK_OPTIONS -framework Cocoa)
+        endif()
+
+        if(SDL2_LIBRARY_RELEASE)
+            set_property(TARGET SDL2::Core APPEND PROPERTY
+                IMPORTED_CONFIGURATIONS RELEASE)
+            set_target_properties(SDL2::Core PROPERTIES
+                IMPORTED_LOCATION_RELEASE ${SDL2_LIBRARY_RELEASE})
+        endif()
+
+        if(SDL2_LIBRARY_DEBUG)
+            set_property(TARGET SDL2::Core APPEND PROPERTY
+                IMPORTED_CONFIGURATIONS DEBUG)
+            set_target_properties(SDL2::Core PROPERTIES
+                IMPORTED_LOCATION_DEBUG ${SDL2_LIBRARY_DEBUG})
+        endif()
+
+        if(NOT SDL2_LIBRARY_RELEASE AND NOT SDL2_LIBRARY_DEBUG)
+            set_property(TARGET SDL2::Core APPEND PROPERTY
+                IMPORTED_LOCATION ${SDL2_LIBRARY})
+        endif()
+    endif()
+
+    # Define the SDL2 target.
+    if(NOT TARGET SDL2::SDL2)
+        add_library(SDL2::SDL2 UNKNOWN IMPORTED)
+        set_target_properties(SDL2::SDL2 PROPERTIES
+            INTERFACE_LINK_LIBRARIES SDL2::Core
+            IMPORTED_LOCATION ${SDL2main_LIBRARIES})
+    endif()
+endif()

externals/cmake-modules/FindSDL2_LICENSE.md

@@ -0,0 +1,15 @@
+Copyright © 2019 [Sandro Stikić](mailto:[email protected])
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted, provided that the
+above copyright notice and this permission notice appear in all
+copies.
+
+**The software is provided "as is" and the author disclaims all
+warranties with regard to this software including all implied
+warranties of merchantability and fitness. In no event shall the
+author be liable for any special, direct, indirect, or consequential
+damages or any damages whatsoever resulting from loss of use, data or
+profits, whether in an action of contract, negligence or other
+tortious action, arising out of or in connection with the use or
+performance of this software.**

externals/cmake-modules/FindSDL2_gfx.cmake

@@ -0,0 +1,110 @@
+# Licensed under the ISC license. Please see the LICENSE.md file for details.
+# Copyright (c) 2019 Sandro Stikić <https://github.com/opeik>
+
+#[[============================================================================
+FindSDL2
+---------
+
+Try to find SDL2_gfx.
+
+This module defines the following IMPORTED targets:
+- SDL2::Gfx — Link against this.
+
+This module defines the following variables:
+- SDL2_GFX_FOUND
+- SDL2_GFX_VERSION_STRING
+- SDL2_GFX_LIBRARIES (deprecated)
+- SDL2_GFX_INCLUDE_DIRS (deprecated)
+#============================================================================]]
+
+# Ensure SDL2 is installed.
+find_package(SDL2 REQUIRED QUIET)
+
+if(NOT SDL2_FOUND)
+    message(FATAL_ERROR "SDL2 not found")
+endif()
+
+# Look for SDL2_gfx.
+find_path(SDL2_GFX_INCLUDE_DIR SDL2_gfxPrimitives.h
+    PATH_SUFFIXES SDL2 include/SDL2 include
+    PATHS ${SDL2_GFX_PATH}
+)
+
+if (NOT SDL2_GFX_LIBRARIES)
+    # Determine architecture.
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(_SDL2_GFX_PATH_SUFFIX lib/x64)
+    else()
+        set(_SDL2_GFX_PATH_SUFFIX lib/x86)
+    endif()
+
+    # Look for the release version of SDL2.
+    find_library(SDL2_GFX_LIBRARY_RELEASE
+        NAMES SDL2_gfx
+        PATH_SUFFIXES lib ${_SDL2_GFX_PATH_SUFFIX}
+        PATHS ${SDL2_PATH}
+    )
+
+    # Look for the debug version of SDL2.
+    find_library(SDL2_GFX_LIBRARY_DEBUG
+        NAMES SDL2_gfxd
+        PATH_SUFFIXES lib ${_SDL2_GFX_PATH_SUFFIX}
+        PATHS ${SDL2_PATH}
+    )
+
+    include(SelectLibraryConfigurations)
+    select_library_configurations(SDL2_GFX)
+endif()
+
+# Find the SDL2_gfx version.
+if(SDL2_GFX_INCLUDE_DIR AND EXISTS "${SDL2_GFX_INCLUDE_DIR}/SDL2_gfxPrimitives.h")
+    file(STRINGS "${SDL2_GFX_INCLUDE_DIR}/SDL2_gfxPrimitives.h" SDL2_GFX_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL2_GFXPRIMITIVES_MAJOR[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_GFX_INCLUDE_DIR}/SDL2_gfxPrimitives.h" SDL2_GFX_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL2_GFXPRIMITIVES_MINOR[ \t]+[0-9]+$")
+    file(STRINGS "${SDL2_GFX_INCLUDE_DIR}/SDL2_gfxPrimitives.h" SDL2_GFX_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL2_GFXPRIMITIVES_MICRO[ \t]+[0-9]+$")
+    string(REGEX REPLACE "^#define[ \t]+SDL2_GFXPRIMITIVES_MAJOR[ \t]+([0-9]+)$" "\\1" SDL2_GFX_VERSION_MAJOR "${SDL2_GFX_VERSION_MAJOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL2_GFXPRIMITIVES_MINOR[ \t]+([0-9]+)$" "\\1" SDL2_GFX_VERSION_MINOR "${SDL2_GFX_VERSION_MINOR_LINE}")
+    string(REGEX REPLACE "^#define[ \t]+SDL2_GFXPRIMITIVES_MICRO[ \t]+([0-9]+)$" "\\1" SDL2_GFX_VERSION_PATCH "${SDL2_GFX_VERSION_PATCH_LINE}")
+    set(SDL2_GFX_VERSION_STRING ${SDL2_GFX_VERSION_MAJOR}.${SDL2_GFX_VERSION_MINOR}.${SDL2_GFX_VERSION_PATCH})
+    unset(SDL2_GFX_VERSION_MAJOR_LINE)
+    unset(SDL2_GFX_VERSION_MINOR_LINE)
+    unset(SDL2_GFX_VERSION_PATCH_LINE)
+    unset(SDL2_GFX_VERSION_MAJOR)
+    unset(SDL2_GFX_VERSION_MINOR)
+    unset(SDL2_GFX_VERSION_PATCH)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SDL2_gfx
+    REQUIRED_VARS SDL2_GFX_LIBRARIES SDL2_GFX_INCLUDE_DIR
+    VERSION_VAR SDL2_GFX_VERSION_STRING)
+
+if(SDL2_GFX_FOUND)
+    set(SDL2_GFX_LIBRARIES ${SDL2_GFX_LIBRARY})
+    set(SDL2_GFX_INCLUDE_DIR ${SDL2_GFX_INCLUDE_DIR})
+
+    # Define the SDL2_gfx target.
+    if(NOT TARGET SDL2::Gfx)
+        add_library(SDL2::Gfx UNKNOWN IMPORTED)
+        set_target_properties(SDL2::Gfx PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES ${SDL2_GFX_INCLUDE_DIR})
+
+        if(SDL2_GFX_LIBRARY_RELEASE)
+            set_property(TARGET SDL2::Gfx APPEND PROPERTY
+                IMPORTED_CONFIGURATIONS RELEASE)
+            set_target_properties(SDL2::Gfx PROPERTIES
+                IMPORTED_LOCATION_RELEASE ${SDL2_GFX_LIBRARY_RELEASE})
+        endif()
+
+        if(SDL2_GFX_LIBRARY_DEBUG)
+            set_property(TARGET SDL2::Gfx APPEND PROPERTY
+                IMPORTED_CONFIGURATIONS DEBUG)
+            set_target_properties(SDL2::Gfx PROPERTIES
+                IMPORTED_LOCATION_DEBUG ${SDL2_GFX_LIBRARY_DEBUG})
+        endif()
+
+        if(NOT SDL2_GFX_LIBRARY_RELEASE AND NOT SDL2_GFX_LIBRARY_DEBUG)
+            set_property(TARGET SDL2::Gfx APPEND PROPERTY
+                IMPORTED_LOCATION ${SDL2_GFX_LIBRARY})
+        endif()
+    endif()
+endif()