aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniil Cherednik <dan.cherednik@gmail.com>2023-12-18 18:50:46 +0100
committerGitHub <noreply@github.com>2023-12-18 18:50:46 +0100
commit065121a354e99e59dfd57124d7650d82213db094 (patch)
tree36d3f40ddc83fd0a886284d235640969e941baef
parent7b479e1358c9b9fa1fd19576d4ac4ef68f0c9c48 (diff)
parentc6b70f76ccf96479671de0d62ecbe7acf198eed4 (diff)
downloadatracdenc-065121a354e99e59dfd57124d7650d82213db094.tar.gz
Merge pull request #33 from SatoFoo/master
Fix CMake build file generation error and add a missing <cstdint> header
-rw-r--r--src/CMakeLists.txt9
-rw-r--r--src/bitstream/bitstream.cpp2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea5144b..70fbd32 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,13 +23,15 @@ function(enable_cxx_compiler_flag_if_supported flag)
endif()
endfunction()
-enable_cxx_compiler_flag_if_supported("-Wall")
-enable_cxx_compiler_flag_if_supported("-Wextra")
-project(atracdenc)
+
+project("atracdenc" CXX C)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
+enable_cxx_compiler_flag_if_supported("-Wall")
+enable_cxx_compiler_flag_if_supported("-Wextra")
+
if (WIN32)
add_compile_definitions(PLATFORM_WINDOWS)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
@@ -100,4 +102,3 @@ set(SOURCE_EXE
add_executable(atracdenc ${SOURCE_EXE})
target_link_libraries(atracdenc pcm_io oma atracdenc_impl ${SNDFILE_LIBRARIES})
install(TARGETS atracdenc)
-
diff --git a/src/bitstream/bitstream.cpp b/src/bitstream/bitstream.cpp
index ddcd288..ddff907 100644
--- a/src/bitstream/bitstream.cpp
+++ b/src/bitstream/bitstream.cpp
@@ -15,7 +15,7 @@
* License along with AtracDEnc; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
+#include <cstdint>
#include "bitstream.h"
#ifndef BIGENDIAN_ORDER