Remove FindSDL2 find-module, use sdl2-config.cmake instead This requires SDL >= 2.0.4. Since <https://bugzilla.libsdl.org/show_bug.cgi?id=2464> was fixed in SDL 2.0.4, SDL behaves as a CMake "config-file package", even if it was not itself built using CMake: it installs a sdl2-config.cmake file to ${libdir}/cmake/SDL2, which tells CMake where to find SDL's headers and library, analogous to a pkg-config .pc file. As a result, we no longer need to copy/paste a "find-module package" to be able to find a system copy of SDL >= 2.0.4 with find_package(SDL2). Find-module packages are now discouraged by the CMake developers, in favour of having upstream projects behave as config-file packages. This results in a small API change: FindSDL2 used to set SDL2_INCLUDE_DIR and SDL2_LIBRARY, but the standard behaviour for config-file packages is to set <name>_INCLUDE_DIRS and <name>_LIBRARIES. Use the CONFIG keyword to make sure we search in config-file package mode, and will not find a FindSDL2.cmake in some other directory that implements the old interface. In addition to deleting redundant code, this avoids some assumptions in FindSDL2 about the layout of a SDL installation. The current libsdl2-dev package in Debian breaks those assumptions; this is considered a bug and will hopefully be fixed soon, but it illustrates how fragile these assumptions can be. We can be more robust against different installation layouts by relying on SDL's own CMake integration. When linking to a copy of CMake in a non-standard location, users can now set the SDL2_DIR or CMAKE_PREFIX_PATH environment variable to point to it; previously, these users would have used the SDL2DIR environment variable. This continues to be unnecessary if using matching system-wide installations of CMake and SDL2, for example both from Debian.

     1

#include "hwengine.h"

     2

     3

#include <QDebug>

     4

#include <QImage>

     5

#include <QUuid>

     6

     7

#include "engine_instance.h"

     8

#include "engine_interface.h"

     9

#include "game_view.h"

    10

#include "preview_acceptor.h"

    11

    12

HWEngine::HWEngine(QObject* parent) : QObject(parent) {}

    13

    14

HWEngine::~HWEngine() {}

    15

    16

void HWEngine::getPreview() {

    17

  emit previewIsRendering();

    18

    19

  m_gameConfig = GameConfig();

    20

  m_gameConfig.cmdSeed(QUuid::createUuid().toByteArray());

    21

    22

  EngineInstance engine(m_engineLibrary);

    23

  if (!engine.isValid())  // TODO: error notification

    24

    return;

    25

    26

  engine.sendConfig(m_gameConfig);

    27

    28

  QImage previewImage = engine.generatePreview();

    29

    30

  if (m_previewAcceptor) m_previewAcceptor->setImage(previewImage);

    31

    32

  emit previewImageChanged();

    33

  // m_runQueue->queue(m_gameConfig);

    34

}

    35

    36

EngineInstance* HWEngine::runQuickGame() {

    37

  m_gameConfig.cmdTheme("Nature");

    38

  Team team1;

    39

  team1.name = "team1";

    40

  Team team2;

    41

  team2.name = "team2";

    42

  team2.color = "7654321";

    43

  m_gameConfig.cmdTeam(team1);

    44

  m_gameConfig.cmdTeam(team2);

    45

    46

  EngineInstance* engine = new EngineInstance(m_engineLibrary, this);

    47

    48

  return engine;

    49

  // m_runQueue->queue(m_gameConfig);

    50

}

    51

    52

int HWEngine::previewHedgehogsCount() const { return m_previewHedgehogsCount; }

    53

    54

PreviewAcceptor* HWEngine::previewAcceptor() const { return m_previewAcceptor; }

    55

    56

QString HWEngine::engineLibrary() const { return m_engineLibrary; }

    57

    58

void HWEngine::setPreviewAcceptor(PreviewAcceptor* previewAcceptor) {

    59

  if (m_previewAcceptor == previewAcceptor) return;

    60

    61

  m_previewAcceptor = previewAcceptor;

    62

  emit previewAcceptorChanged(m_previewAcceptor);

    63

}

    64

    65

void HWEngine::setEngineLibrary(const QString& engineLibrary) {

    66

  if (m_engineLibrary == engineLibrary) return;

    67

    68

  m_engineLibrary = engineLibrary;

    69

  emit engineLibraryChanged(m_engineLibrary);

    70

}