Updated CMake version; update minimp3 to the latest WIP

corporateshark · Nov 1, 2021 · 92b162c · 92b162c
1 parent a8ec075
commit 92b162c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 project("PortAMP")
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

diff --git a/README.md b/README.md
@@ -37,9 +37,7 @@ Clone:
 ------------------------
 
 ```
-git clone https://github.com/corporateshark/PortAMP
-git submodule init
-git submodule update
+git clone https://github.com/corporateshark/PortAMP --recursive
 ```
 
 UNIX build instructions:
@@ -58,7 +56,7 @@ Windows build instructions:
 ```
 mkdir build
 cd build
-cmake .. -G "Visual Studio 15 2017"
+cmake .. -G "Visual Studio 16 2019" -A x64
 start PortAMP.sln
 ```
 

diff --git a/libs/flac-1.3.3/CMakeLists.txt b/libs/flac-1.3.3/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 PROJECT(libflac)
 
 if(MSVC)

diff --git a/libs/id3v2lib/CMakeLists.txt b/libs/id3v2lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 PROJECT(id3v2lib)
 
 if(MSVC)

diff --git a/libs/libmodplug-0.8.8.5/CMakeLists.txt b/libs/libmodplug-0.8.8.5/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 
 project("libmodplug")
 

diff --git a/libs/libogg-1.3.2/CMakeLists.txt b/libs/libogg-1.3.2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 
 project("libogg")
 

diff --git a/libs/libopus/CMakeLists.txt b/libs/libopus/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 PROJECT(libopus)
 
 if(MSVC)

diff --git a/libs/libopusfile/CMakeLists.txt b/libs/libopusfile/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 PROJECT(libopusfile)
 
 if(MSVC)

diff --git a/libs/libvorbis-1.3.5/CMakeLists.txt b/libs/libvorbis-1.3.5/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 
 project("libvorbis")
 

diff --git a/libs/minimp3 b/libs/minimp3
diff --git a/libs/monkey-audio/CMakeLists.txt b/libs/monkey-audio/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 PROJECT(monkeyaudio)
 
 if(MSVC)
+2 −0		.gitignore
+111 −17		README.md
+85 −60		minimp3.h
+1,099 −103		minimp3_ex.h
+506 −43		minimp3_test.c
+1 −1		player/build.sh
+7 −62		player/decode.c
+2 −8		player/decode.h
+14 −2		player/player.cpp
+1 −1		player/system.cpp
+1 −1		player/system.h
+114 −4		scripts/build.sh
+28 −0		scripts/test_mode.sh
+0 −20		scripts/test_mp4_mode.sh
+ −		vectors/ILL2_center2.pcm
+ −		vectors/ILL2_dual.pcm
+ −		vectors/ILL2_dynx22.pcm
+ −		vectors/ILL2_dynx31.pcm
+ −		vectors/ILL2_dynx32.pcm
+ −		vectors/ILL2_mono.pcm
+ −		vectors/ILL2_multilingual.pcm
+ −		vectors/ILL2_overalloc1.pcm
+ −		vectors/ILL2_prediction.pcm
+ −		vectors/ILL2_samples.pcm
+ −		vectors/ILL2_scf63.pcm
+ −		vectors/ILL2_tca21.pcm
+ −		vectors/ILL2_tca30.pcm
+ −		vectors/ILL2_tca30_PC.pcm
+ −		vectors/ILL2_tca31_PC.pcm
+ −		vectors/ILL2_tca31_mtx0.pcm
+ −		vectors/ILL2_tca31_mtx2.pcm
+ −		vectors/ILL2_tca32_PC.pcm
+ −		vectors/ILL2_wrongcrc.pcm
+ −		vectors/ILL4_ext_id1.pcm
+ −		vectors/ILL4_sync.pcm
+ −		vectors/ILL4_wrong_length1.pcm
+ −		vectors/ILL4_wrong_length2.pcm
+ −		vectors/ILL4_wrongcrc.pcm
+ −		vectors/l3-nonstandard-apetag.bit
+ −		vectors/l3-nonstandard-apetag.pcm
+ −		vectors/l3-nonstandard-he_44_48khz.bit
+ −		vectors/l3-nonstandard-he_44_48khz.pcm
+ −		vectors/l3-nonstandard-id3v1-apetag.bit
+ −		vectors/l3-nonstandard-id3v1-apetag.pcm
+ −		vectors/l3-nonstandard-id3v1.bit
+ −		vectors/l3-nonstandard-id3v1.pcm
+ −		vectors/l3-nonstandard-id3v2-only.bit
+0 −0		vectors/l3-nonstandard-id3v2-only.pcm
+ −		vectors/l3-nonstandard-id3v2.bit
+ −		vectors/l3-nonstandard-id3v2.pcm
+ −		vectors/l3-nonstandard-sin1k0db_lame_vbrtag.bit
+ −		vectors/l3-nonstandard-sin1k0db_lame_vbrtag.pcm
+1 −0		vectors/l3-nonstandard-small.bit
+0 −0		vectors/l3-nonstandard-small.pcm
+ −		vectors/l3-nonstandard-vbrtag-corrupted.bit
+0 −0		vectors/l3-nonstandard-vbrtag-corrupted.pcm
+ −		vectors/l3-nonstandard-vbrtag-empty.bit
+0 −0		vectors/l3-nonstandard-vbrtag-empty.pcm
+ −		vectors/l3-nonstandard-vbrtag-noframes.bit
+0 −0		vectors/l3-nonstandard-vbrtag-noframes.pcm
+ −		vectors/l3-nonstandard-vbrtag-only.bit
+0 −0		vectors/l3-nonstandard-vbrtag-only.pcm
+ −		vectors/l3-sin1k0db_ofs633.pcm