From b004efd53d6a104f4ed92e3b2d6ae6495be1afe9 Mon Sep 17 00:00:00 2001 From: Gilles Boccon-Gibod Date: Fri, 24 Apr 2020 15:11:48 -0700 Subject: [PATCH] fix CMake build for Windows --- CMakeLists.txt | 4 +++- Documents/MkDocs/mkdocs.yml | 3 +-- README.md | 9 ++++++--- Test/Data/video-h264-002.mp4 | Bin 38438 -> 37926 bytes 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 531325fd..dec68919 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,9 @@ set(SOURCE_METADATA ${SOURCE_ROOT}/MetaData) set(SOURCE_SYSTEM ${SOURCE_ROOT}/System) # Compiler warning and optimization flags -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-class-memaccess") +if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-class-memaccess") +endif() if (EMSCRIPTEN) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths") diff --git a/Documents/MkDocs/mkdocs.yml b/Documents/MkDocs/mkdocs.yml index 9a5bb186..d8373ab4 100644 --- a/Documents/MkDocs/mkdocs.yml +++ b/Documents/MkDocs/mkdocs.yml @@ -9,8 +9,7 @@ copyright: © 2020 Axiomatic Systems, LLC. All rights reserved. theme: name: 'material' - logo: - icon: "\uE80D" + logo: 'images/bento4-small.jpg' custom_dir: 'theme' docs_dir: 'src' diff --git a/README.md b/README.md index cc29a8e5..464c4c9b 100644 --- a/README.md +++ b/README.md @@ -81,21 +81,24 @@ Open the Visual Studio solution file Build/Targets/x86-microsoft-win32-vs2010/Be CMake can generate Makefiles, Xcode project files, or Visual Studios project files. #### CMake/Make + mkdir cmakebuild cd cmakebuild cmake -DCMAKE_BUILD_TYPE=Release .. make #### CMake/Xcode + mkdir cmakebuild cd cmakebuild - cmake -G Xcode -DCMAKE_BUILD_TYPE=Release .. + cmake -G Xcode + cmake --build . --config Release #### CMake/Visual Studio mkdir cmakebuild cd cmakebuild - cmake -G "Visual Studio 10 Win64" -DCMAKE_BUILD_TYPE=Release .. - + cmake -DCMAKE_BUILD_TYPE=Release .. + cmake --build . --config Release #### CMake for Android NDK mkdir cmakebuild diff --git a/Test/Data/video-h264-002.mp4 b/Test/Data/video-h264-002.mp4 index dca5663aef21a2685c1ad7c8b4e0bd3b4877eae3..3db58582a7d7b9e381d71685492c34d5bab39eae 100644 GIT binary patch delta 974 zcmZXSJ!n)>5QS&%d&^1?jDqfxD5#aD5G<5nBWe7NB8nP`#9cKpqML=?RUruLPhq9a z6O^D3Ap{W%VX+cYt5vWO!A3z4Q7dcl9OrtNEFPuntPW)5|ErT;Etc}i2J5uyQ)aflGc|qQk_}<*q4IL^ zEg$Im>rU&+j9Fg^>78b2BVLNJYMWVk8Sb~3&zogz#mIgKr*5zx3AUT!XW}QprQ5;2 zI@sQ+e)lhT%|9z~Ck$z?_-k-BEB+GfyTzZxyTlFkZxLS;SAu=JI8*%>8Gn%$WEhv> zvUn~ydmNmqst>Ea6zng>n^j*U#tw3155(VtOZUY0!6T5riiG`?VTJfsuEFj( zLhcMS37v!3Qy13|&q5OrbBtte2j^{wTf}$NAbKwD!-FO+$jAk0W)t~>A{U#1*u*(K bjMGpJs`rLxKMbzDy5R0W97C&#$T9H;Hq(1X delta 1526 zcmZXUK}b|#5Xa}6_cnvdw$xVYQe7$!L6;CO;iX6|!l;bGvQ{&4UD%!&5j;%6lU`mB zM1es_Lq%o|3;^1bvGFP(9HeLG z9Nhz}Ci!E?>4r;5V`>s$M~RY?l>f#cwX6f|J`Uic|GG8Gm-6SRE0hEt{Z)=B0DZXO zf(kIB4epKMFO`>OmAgI4;gfP$Q0~4PKEKIRz%xeJ*c2doX!sB1?v&x*4DT_#rW}tN zK5cl#bJ~A6t`kOxOv4|;UnzIj44*Lkneym`a_m%&-O63Ms)BoGgu}{lui^9?`^zsn zdTRJj<)uZ#pD1_lmBX)`_xVAk?M8TP8crMj+3;hAe-z$a+xE4d;)hzj?hRe8c|+$H zc@$UJ=w&v#SBQJ#|7Y^K+~kq>{&^~+HO9W4ZXwd?hj^3YIgSJ5=OEC+L+s~xiQ~lr zC)0bTPlS-i+ z%{?A;gX1X2+Z^RZBL!XhZ!sU{D0PyHUd{CsM7Yll