Ver código fonte

Enable FFmpeg for all platforms

Michael Pavlyshko 11 anos atrás
pai
commit
3c36bc9f51
1 arquivos alterados com 2 adições e 5 exclusões
  1. 2 5
      CMakeLists.txt

+ 2 - 5
CMakeLists.txt

@@ -88,8 +88,10 @@ if(NOT WIN32)
 	endif()
 endif()
 
+set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE)
 find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale REQUIRED)
 find_package(ZLIB REQUIRED)
+find_package(FFmpeg REQUIRED)
 
 if (ENABLE_SDL2)
 	find_package(SDL2 REQUIRED)
@@ -124,11 +126,6 @@ if(ENABLE_TEST)
 	find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED)
 endif()
 
-if(NOT WIN32)
-	set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE)
-	find_package(FFmpeg REQUIRED)
-endif()
-
 if(CMAKE_COMPILER_IS_GNUCXX OR NOT WIN32) #so far all *nix compilers support such parameters
 	if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 		set(CLANG_SPECIFIC_FLAGS "-Wno-mismatched-tags")