diff --git a/CMakeLists.txt b/CMakeLists.txt index 3919806..96c1881 100644 --- 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 index 059c593..216ae72 100644 --- 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 index a157772..e9a5475 100644 --- 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 index aa3c2c4..b09fe07 100644 --- 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 index c835bd1..e2b7472 100644 --- 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 index 5fc14b3..24651c0 100644 --- 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 index d6b8e04..5a758e4 100644 --- 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 index 298baae..400833d 100644 --- 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 index 6650ffe..1a16c49 100644 --- 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 index cf038fa..ca7c706 160000 --- a/libs/minimp3 +++ b/libs/minimp3 @@ -1 +1 @@ -Subproject commit cf038fa3dfdb0f469fd23795939009bf3c354d4a +Subproject commit ca7c706001331a5a8e3182ce3b3ce3b243589154 diff --git a/libs/monkey-audio/CMakeLists.txt b/libs/monkey-audio/CMakeLists.txt index 4b343a5..b31be37 100644 --- 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)