diff --git a/.gitmodules b/.gitmodules index 4f9d591..c3501c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/backends/playback/gme/CMakeLists.txt b/backends/playback/gme/CMakeLists.txt index 8e287f7..9992cee 100644 --- a/backends/playback/gme/CMakeLists.txt +++ b/backends/playback/gme/CMakeLists.txt @@ -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) diff --git a/backends/playback/gme/game-music-emu b/backends/playback/gme/game-music-emu deleted file mode 160000 index e76bdc0..0000000 --- a/backends/playback/gme/game-music-emu +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e76bdc0cb916e79aa540290e6edd0c445879d3ba