Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/build-game.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,9 @@ jobs:
ninja

- name: Test
env:
SDL_VIDEODRIVER: dummy
SDL_AUDIODRIVER: dummy
run: |
cd build
ctest -j2 --output-on-failure
xvfb-run -a ctest -j2 --output-on-failure

- name: Upload build to itch.io
env:
Expand Down
1 change: 1 addition & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def requirements(self):
self.requires("sdl_image/2.8.12")
self.requires("sdl_ttf/2.24.0")
self.requires("vorbis/1.3.7")
self.requires("zlib/1.3.1", force=True)

def generate(self):
tc = CMakeToolchain(self)
Expand Down
6 changes: 0 additions & 6 deletions src/engine/WindowManager.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,7 @@ WindowManager::WindowManager()
throw UIError(TRACE_INFO "Failed to create window: " + string{SDL_GetError()});

rendererFlags = SDL_RENDERER_ACCELERATED | (Settings::instance().vSync ? SDL_RENDERER_PRESENTVSYNC : 0);

#if defined(TESTING_ENABLED) && defined(__linux)
// Set the index to 2 for running tests
m_renderer = SDL_CreateRenderer(m_window, 2, rendererFlags);
#else
m_renderer = SDL_CreateRenderer(m_window, -1, rendererFlags);
#endif

SDL_RendererInfo info;
SDL_GetRendererInfo(m_renderer, &info);
Expand Down
1 change: 0 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ endforeach ()

LIST(APPEND TEST_SOURCES
main.cxx
Example.cxx
engine/basics/Point.cxx
engine/basics/Settings.cxx
engine/ResourcesManager.cxx
Expand Down
96 changes: 0 additions & 96 deletions tests/Example.cxx

This file was deleted.

Loading