diff --git a/CMakeLists.txt b/CMakeLists.txt index 202a4d50..bf2035d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ set(DEP_OPENAL_VER "1.15.1") set(DEP_JASPER_VER "1.900.1") set(DEP_TIFF_VER "4.0.3") set(DEP_DEVIL_VER "1.7.8") +set(DEP_MODPLUG_VER "0.8.8.4") set(SKIP_INSTALL_ALL TRUE) @@ -44,6 +45,7 @@ add_subdirectory("libs/openal-soft-${DEP_OPENAL_VER}" ${CMAKE_BINARY_DIR}/openal add_subdirectory("libs/jasper-${DEP_JASPER_VER}" ${CMAKE_BINARY_DIR}/jasper) add_subdirectory("libs/tiff-${DEP_TIFF_VER}" ${CMAKE_BINARY_DIR}/tiff) add_subdirectory("libs/DevIL-${DEP_DEVIL_VER}" ${CMAKE_BINARY_DIR}/DevIL) +add_subdirectory("libs/libmodplug-${DEP_MODPLUG_VER}" ${CMAKE_BINARY_DIR}/libmodplug) link_directories(${SDL_LINK_DIR}) add_executable(ldeptest src/test.cpp) @@ -64,6 +66,7 @@ target_link_libraries(ldeptest jasper-static tiff-static DevIL + modplug-static ) function(add_move_dll ARG_TARGET) diff --git a/src/test.cpp b/src/test.cpp index 29e40e2c..a742a66b 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #ifdef WIN32 #define JAS_WIN_MSVC_BUILD @@ -178,6 +179,15 @@ int main(int argc, char **argv) return "DevIL"; }; + vfunc modplug = [](strs &c, strs &l) + { + ModPlug_Settings settings; + ModPlug_GetSettings(&settings); + c << "N/A"; + l << "N/A"; + return "modplug"; + }; + std::vector funcs; funcs.push_back(zlib); funcs.push_back(physfs); @@ -194,6 +204,7 @@ int main(int argc, char **argv) funcs.push_back(jasper); funcs.push_back(tiff); funcs.push_back(DevIL); + funcs.push_back(modplug); for (size_t i = 0; i < funcs.size(); ++i) {