diff --git a/CMakeLists.txt b/CMakeLists.txt index 6749610d..bb073d07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ #[=========================================================================[ - Copyright (c) 2022 Pedro López-Cabanillas + Copyright (c) 2022-2023 Pedro López-Cabanillas Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ if (BUILD_TESTING) endif() endif() -if (UNIX AND NOT APPLE) +if (UNIX AND NOT APPLE AND NOT EMSCRIPTEN) find_library(MATH_LIBRARY m) message(STATUS "Math library: ${MATH_LIBRARY}") else() @@ -94,8 +94,8 @@ list(APPEND SOURCES #arm-wt-22k/lib_src/eas_wavefiledata.c arm-wt-22k/lib_src/eas_wtengine.c arm-wt-22k/lib_src/eas_wtsynth.c -#arm-wt-22k/lib_src/eas_xmf.c -#arm-wt-22k/lib_src/eas_xmfdata.c + arm-wt-22k/lib_src/eas_xmf.c + arm-wt-22k/lib_src/eas_xmfdata.c #arm-wt-22k/lib_src/jet.c arm-wt-22k/lib_src/wt_22khz.c ) @@ -126,7 +126,7 @@ target_compile_definitions( sonivox-objects PRIVATE #_IMELODY_PARSER #_RTTTL_PARSER #_OTA_PARSER - #_XMF_PARSER + _XMF_PARSER #JET_INTERFACE ) diff --git a/README.md b/README.md index fd00f675..69a770d7 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ Example 3: pipe the rendered audio thru the 'lame' utility creating a MP3 file: $ sonivoxrender ants.mid | lame -r -s 22050 - ants.mp3 +You may replace "ants.mid" by another MIDI or XMF file, like "test/res/testmxmf.mxmf" + ## Unit tests The Android unit tests have been integrated in the CMake build system, with little modifications. A requirement is GoogleTest, either installed system wide or it will be downloaded from the git repository. @@ -67,9 +69,9 @@ There are two environment variables that you may set before running the tests (m ## License -Copyright (c) 2022 Pedro López-Cabanillas. +Copyright (c) 2022-2023 Pedro López-Cabanillas. -Copyright (c) 2008-2022, The Android Open Source Project. +Copyright (c) 2008-2023, The Android Open Source Project. Copyright (c) 2004-2006 Sonic Network Inc. diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 25e61136..62244a7b 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,5 +1,5 @@ #[=========================================================================[ - Copyright (c) 2022 Pedro López-Cabanillas + Copyright (c) 2022-2023 Pedro López-Cabanillas Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ project( sonivoxrender LANGUAGES C ) # Alternative 1: Using CMake only and sonivox installed: find_package ( sonivox CONFIG REQUIRED ) add_executable ( sonivoxrender sonivoxrender.c ) +target_compile_definitions( sonivoxrender PRIVATE _LARGEFILE64_SOURCE ) target_link_libraries ( sonivoxrender sonivox::sonivox-static ) # Alternative 2: Using pkg-config and sonivox installed: diff --git a/example/sonivoxrender.c b/example/sonivoxrender.c index 2c99338b..59d42fff 100644 --- a/example/sonivoxrender.c +++ b/example/sonivoxrender.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Pedro López-Cabanillas + * Copyright (c) 2022-2023, Pedro López-Cabanillas * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/SonivoxTest.cpp b/test/SonivoxTest.cpp index f0654419..7c6646a6 100644 --- a/test/SonivoxTest.cpp +++ b/test/SonivoxTest.cpp @@ -103,6 +103,9 @@ class SonivoxTest : public ::testing::TestWithParam