Use system game-music-emu
Some checks failed
Build / download-system-deps (push) Successful in 5m0s
Build / build-gentoo (push) Failing after 14s
Build / get-source-code (push) Successful in 12m59s
Build / build-deb (push) Failing after 5m28s
Build / build-appimage (push) Successful in 4m46s
Build / build-android (push) Failing after 3m22s
Build / build-windows (push) Failing after 7m54s

This commit is contained in:
Zachary Hall 2025-01-18 09:56:34 -08:00
parent 8d9cf9372e
commit c2a971d225
5 changed files with 4 additions and 9 deletions

3
.gitmodules vendored
View file

@ -57,6 +57,3 @@
[submodule "subprojects/protobuf-c"]
path = subprojects/protobuf-c
url = https://github.com/protobuf-c/protobuf-c.git
[submodule "backends/playback/gme/game-music-emu"]
path = backends/playback/gme/game-music-emu
url = https://github.com/libgme/game-music-emu.git

View file

@ -1,8 +1,7 @@
set(BACKEND_GME_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gme_backend.cpp)
set(BACKEND_GME_INC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(game-music-emu)
pkg_check_modules(libgme IMPORTED_TARGET libgme)
add_playback_backend(gme_backend ${BACKEND_GME_SRC})
target_include_directories(gme_backend PRIVATE ${BACKEND_GME_INC})
find_package(OpenMP)
target_include_directories(gme_backend PUBLIC game-music-emu/gme)
target_link_libraries(gme_backend PUBLIC gme OpenMP::OpenMP_CXX)
target_link_libraries(gme_backend PUBLIC PkgConfig::libgme OpenMP::OpenMP_CXX)

@ -1 +0,0 @@
Subproject commit e76bdc0cb916e79aa540290e6edd0c445879d3ba

View file

@ -11,7 +11,7 @@
#include <license.hpp>
#include <assets/assets.h>
#include <limits.h>
#include <gme.h>
#include <gme/gme.h>
void GmeBackend::load(const char *filename) {
memset(&spec, 0, sizeof(spec));
current_file = filename;

View file

@ -10,7 +10,7 @@
#include <vector>
#include <util.hpp>
#include <SDL.h>
#include <gme.h>
#include <gme/gme.h>
#include "file_backend.hpp"
class GmeBackend : public PlaybackBackend {
File *file;