Fixed compilation on Ubuntu 20.04

corporateshark · May 23, 2023 · f2eca25 · f2eca25
1 parent f92e54b
commit f2eca25
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,6 +83,14 @@ if(MSVC)
 		libopus
 		libopusfile
 	)
+	set_property(TARGET libogg PROPERTY FOLDER ThirdParty)
+	set_property(TARGET libvorbis PROPERTY FOLDER ThirdParty)
+	set_property(TARGET libmodplug PROPERTY FOLDER ThirdParty)
+	set_property(TARGET libflac PROPERTY FOLDER ThirdParty)
+	set_property(TARGET id3v2 PROPERTY FOLDER ThirdParty)
+	set_property(TARGET monkeyaudio PROPERTY FOLDER ThirdParty)
+	set_property(TARGET libopus PROPERTY FOLDER ThirdParty)
+	set_property(TARGET libopusfile PROPERTY FOLDER ThirdParty)
 elseif(APPLE)
 	add_subdirectory(libs/libogg-1.3.2 EXCLUDE_FROM_ALL)
 	add_subdirectory(libs/libvorbis-1.3.5 EXCLUDE_FROM_ALL)
@@ -109,18 +117,14 @@ elseif(APPLE)
 	find_package(OpenAL REQUIRED)
 	target_link_libraries(portamp "${OPENAL_LIBRARY}")
 else()
-	add_subdirectory(libs/id3v2lib EXCLUDE_FROM_ALL)
 	add_subdirectory(libs/monkey-audio EXCLUDE_FROM_ALL)
-	add_subdirectory(libs/libopus EXCLUDE_FROM_ALL)
-	add_subdirectory(libs/libopusfile EXCLUDE_FROM_ALL)
 	set(CMAKE_CXX_FLAGS "-std=c++11")
 	target_link_libraries(portamp
 		ogg
 		vorbis
 		vorbisfile
 		modplug
 		FLAC
-		id3v2
 		monkeyaudio
 		opus
 		opusfile
@@ -130,12 +134,3 @@ else()
 	)
 	include_directories(/usr/local/include)
 endif()
-
-set_property(TARGET libogg PROPERTY FOLDER ThirdParty)
-set_property(TARGET libvorbis PROPERTY FOLDER ThirdParty)
-set_property(TARGET libmodplug PROPERTY FOLDER ThirdParty)
-set_property(TARGET libflac PROPERTY FOLDER ThirdParty)
-set_property(TARGET id3v2 PROPERTY FOLDER ThirdParty)
-set_property(TARGET monkeyaudio PROPERTY FOLDER ThirdParty)
-set_property(TARGET libopus PROPERTY FOLDER ThirdParty)
-set_property(TARGET libopusfile PROPERTY FOLDER ThirdParty)
diff --git a/README.md b/README.md
@@ -44,6 +44,7 @@ UNIX build instructions:
 ------------------------
 
 ```
+sudo apt-get install libopus-dev libopusfile-dev libflac-dev
 mkdir build
 cd build
 cmake .. -G "Unix Makefiles"

diff --git a/src/Encoders/WAV/WAVDataEncoder.cpp b/src/Encoders/WAV/WAVDataEncoder.cpp
@@ -1,5 +1,7 @@
 #include "WAVDataEncoder.h"
 
+#include <string.h>
+
 static void PatchValue( uint8_t* Ptr, uint64_t Value, size_t Size )
 {
 	for ( ; Size; --Size, Value >>= 8 )

diff --git a/src/Encoders/WAV/WAVDataEncoder.h b/src/Encoders/WAV/WAVDataEncoder.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "Encoders/iWaveDataEncoder.h"
 
 class clWAVDataEncoder: public iWaveDataEncoder