Merge pull request #496 from dimitry-ishenko-casparcg/2.1.0-fixes

[casparcg] / accelerator / CMakeLists.txt

diff --git a/accelerator/CMakeLists.txt b/accelerator/CMakeLists.txt
index 2e79ea862888bf94eb31a482835307f072b33382..dd4adf3315154e332a1d6695b391ce90d64b4e39 100644 (file)
--- a/accelerator/CMakeLists.txt
+++ b/accelerator/CMakeLists.txt
@@ -1,8 +1,16 @@
 cmake_minimum_required (VERSION 2.6)
 project (accelerator)
 
+if (MSVC)
+       set(OS_SPECIFIC_SOURCES
+                       cpu/image/image_mixer.cpp
+                       cpu/image/image_mixer.h
+       
+                       cpu/util/xmm.h
+       )
+elseif (CMAKE_COMPILER_IS_GNUCXX)
+endif ()
 set(SOURCES
-               cpu/image/image_mixer.cpp
 
                ogl/image/image_kernel.cpp
                ogl/image/image_mixer.cpp
@@ -17,10 +25,6 @@ set(SOURCES
                StdAfx.cpp
 )
 set(HEADERS
-               cpu/image/image_mixer.h
-
-               cpu/util/xmm.h
-
                ogl/image/blending_glsl.h
                ogl/image/image_kernel.h
                ogl/image/image_mixer.h
@@ -35,7 +39,7 @@ set(HEADERS
                StdAfx.h
 )
 
-add_library(accelerator ${SOURCES} ${HEADERS})
+add_library(accelerator ${SOURCES} ${HEADERS} ${OS_SPECIFIC_SOURCES})
 add_precompiled_header(accelerator StdAfx.h FORCEINCLUDE)
 
 include_directories(..)
@@ -52,4 +56,4 @@ source_group(sources\\cpu\\image cpu/image/*)
 source_group(sources\\ogl\\image ogl/image/*)
 source_group(sources\\ogl\\util ogl/util/*)
 
-target_link_libraries(accelerator common core)
+target_link_libraries(accelerator common core ffmpeg)