|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:40
|
Module: performous
Branch: dance
Commit: 9183546df284a5961921b9812ec5136f46374eb4
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Dec 2 22:11:50 2009 +0200
Revert "Link to static ffmpeg (Windows). DLLs causes a ntdll exception" because it makes building fail on Linux (undefined references).
This reverts commit 6cc6cd6f133f1ab794016ec3800de9c5c9448316.
---
cmake/Modules/FindAVCodec.cmake | 2 +-
cmake/Modules/FindAVFormat.cmake | 2 +-
cmake/Modules/FindAVUtil.cmake | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/Modules/FindAVCodec.cmake b/cmake/Modules/FindAVCodec.cmake
index 36d5258..400ac58 100644
--- a/cmake/Modules/FindAVCodec.cmake
+++ b/cmake/Modules/FindAVCodec.cmake
@@ -38,7 +38,7 @@ if(AVCodec_INCLUDE_DIR)
endif(AVCodec_INCLUDE_DIR)
find_library(AVCodec_LIBRARY
- NAMES libavcodec.a avcodec
+ NAMES libavcodec.dll.a avcodec
PATHS ${AVCodec_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVFormat.cmake b/cmake/Modules/FindAVFormat.cmake
index 15421e6..b02d2a6 100644
--- a/cmake/Modules/FindAVFormat.cmake
+++ b/cmake/Modules/FindAVFormat.cmake
@@ -36,7 +36,7 @@ if(AVFormat_INCLUDE_DIR)
endif(AVFormat_INCLUDE_DIR)
find_library(AVFormat_LIBRARY
- NAMES libavformat.a avformat
+ NAMES libavformat.dll.a avformat
PATHS ${AVFormat_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVUtil.cmake b/cmake/Modules/FindAVUtil.cmake
index 764d05c..99bfbfb 100644
--- a/cmake/Modules/FindAVUtil.cmake
+++ b/cmake/Modules/FindAVUtil.cmake
@@ -34,7 +34,7 @@ if(AVUtil_INCLUDE_DIR)
endif(AVUtil_INCLUDE_DIR)
find_library(AVUtil_LIBRARY
- NAMES libavutil.a avutil
+ NAMES libavutil.dll.a avutil
PATHS ${AVUtil_PKGCONF_LIBRARY_DIRS}
)
|