Author: glen Date: Thu Dec 17 16:55:21 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- more -L paths
---- Files affected:
packages/avidemux:
link-libs.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/avidemux/link-libs.patch
diff -u packages/avidemux/link-libs.patch:1.1
packages/avidemux/link-libs.patch:1.2
--- packages/avidemux/link-libs.patch:1.1 Thu Dec 17 16:48:44 2009
+++ packages/avidemux/link-libs.patch Thu Dec 17 17:55:16 2009
@@ -572,11 +572,14 @@
INSTALL_VIDEOFILTER(ADM_vf_dropOut)
--- avidemux_2.5.1/cmake/vf_plugin_gtk.cmake~ 2009-12-17 15:59:01.000000000
+0200
+++ avidemux_2.5.1/cmake/vf_plugin_gtk.cmake 2009-12-17 17:41:13.755986519
+0200
-@@ -20,6 +20,11 @@
+@@ -20,6 +20,14 @@
TARGET_LINK_LIBRARIES( ${lib} ADM_UIGtk ADM_render_gtk)
TARGET_LINK_LIBRARIES(${lib} ${GTK_LDFLAGS} ${GTHREAD_LDFLAGS})
+ IF (UNIX)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
+ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_UIs/ADM_GTK/src)
+ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_userInterfaces/ADM_render)
+ ENDIF (UNIX)
@@ -584,3 +587,534 @@
IF (GETTEXT_FOUND)
TARGET_LINK_LIBRARIES(${lib} ${GETTEXT_LIBRARY_DIR})
ENDIF(GETTEXT_FOUND)
+---
avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/CMakeLists.txt
2009-12-17 18:04:32.039363834 +0200
+@@ -17,6 +17,11 @@
+ ADD_DEFINITIONS(${GTK_CFLAGS})
+ ADD_LIBRARY(${GTK_PLUGIN_NAME} SHARED ${ADM_vidEnc_xvid_Gtk_SRCS})
+ TARGET_LINK_LIBRARIES(${GTK_PLUGIN_NAME} ADM_vidEnc_xvid ADM_coreUI
${GTK_LDFLAGS} ${GTHREAD_LDFLAGS})
++
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(${GTK_PLUGIN_NAME}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(${GTK_PLUGIN_NAME}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ENDIF (UNIX)
+
+ IF (GETTEXT_FOUND)
+ TARGET_LINK_LIBRARIES(${GTK_PLUGIN_NAME} ${GETTEXT_LIBRARY_DIR})
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Telecide/CMakeLists.txt~
2009-12-17 18:06:41.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Telecide/CMakeLists.txt
2009-12-17 18:06:45.132903518 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_telecide_SRCS ADM_vidDecTelecide.cpp videoFunctions.cpp)
+
+ ADD_LIBRARY(ADM_vf_telecide SHARED ${ADM_vf_telecide_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_telecide
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_telecide
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_telecide
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_telecide)
+ INSTALL_VIDEOFILTER(ADM_vf_telecide)
+--- avidemux_2.5.1/cmake/vf_plugin_qt4.cmake~ 2009-12-17 17:48:16.000000000
+0200
++++ avidemux_2.5.1/cmake/vf_plugin_qt4.cmake 2009-12-17 18:09:26.880584294
+0200
+@@ -18,6 +18,14 @@
+ TARGET_LINK_LIBRARIES( ${lib} ADM_UIQT4 ADM_render_qt4)
+ TARGET_LINK_LIBRARIES(${lib} ${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY})
+
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_UIs/ADM_QT4/src)
++ ADD_TARGET_LDFLAGS(${lib}
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_userInterfaces/ADM_render)
++ ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(${lib})
+ INSTALL_VIDEOFILTER(${lib})
+ ENDIF (QT4_FOUND)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/MplayerResize/CMakeLists.txt~
2009-12-17 18:13:53.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/MplayerResize/CMakeLists.txt
2009-12-17 18:14:02.269098903 +0200
+@@ -1,6 +1,16 @@
+ INCLUDE(vf_plugin)
+ include(admFFmpegUtil)
+
++if (WIN32)
++ set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++ set(LIBAVUTIL_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++ set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++else (WIN32)
++ set(LIBAVCODEC_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec)
++ set(LIBAVUTIL_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavutil)
++ set(LIBSWSCALE_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libswscale)
++endif (WIN32)
++
+ SET(resizeCommon_SRCS ADM_vidMPLResize.cpp)
+ SET(resizeCommonGtk_SRCS gtk/gtk_resize.cpp)
+ SET(resizeCommonQT_SRCS qt4/Q_resize.cpp)
+@@ -12,13 +22,13 @@
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+
+ add_library(ADM_libswscale UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBSWSCALE_LIB}")
++set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION
"${LIBSWSCALE_INSTALL_DIR}/${LIBSWSCALE_LIB}")
+
+ add_library(ADM_libavcodec UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}")
++set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION
"${LIBAVCODEC_INSTALL_DIR}/${LIBAVCODEC_LIB}")
+
+ add_library(ADM_libavutil UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBAVUTIL_LIB}")
++set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION
"${LIBAVUTIL_INSTALL_DIR}/${LIBAVUTIL_LIB}")
+
+ INCLUDE(vf_plugin_gtk)
+ INIT_VIDEOFILTER_PLUGIN_GTK(ADM_vf_mplayerResize_gtk ${resizeCommonGtk_SRCS}
${resizeCommon_SRCS})
+--- avidemux_2.5.1/plugins/ADM_videoFilters/BlackenBorders/CMakeLists.txt~
2009-12-17 18:15:32.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/BlackenBorders/CMakeLists.txt
2009-12-17 18:15:34.575755761 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_blackenBorders_SRCS ADM_vidBlackenBorders.cpp)
+
+ ADD_LIBRARY(ADM_vf_blackenBorders SHARED ${ADM_vf_blackenBorders_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_blackenBorders
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_blackenBorders
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_blackenBorders
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_blackenBorders)
+ INSTALL_VIDEOFILTER(ADM_vf_blackenBorders)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/KernelDeint/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/KernelDeint/CMakeLists.txt
2009-12-17 18:15:53.225754243 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_kernelDeint_SRCS ADM_vidKernelDeint.cpp)
+
+ ADD_LIBRARY(ADM_vf_kernelDeint SHARED ${ADM_vf_kernelDeint_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_kernelDeint
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_kernelDeint
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_kernelDeint
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_kernelDeint)
+ INSTALL_VIDEOFILTER(ADM_vf_kernelDeint)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Deinterlace/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Deinterlace/CMakeLists.txt
2009-12-17 18:16:18.419085514 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_Deinterlace_SRCS ADM_vidDeinterlace.cpp)
+
+ ADD_LIBRARY(ADM_vf_Deinterlace SHARED ${ADM_vf_Deinterlace_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_Deinterlace
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Deinterlace
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Deinterlace
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_Deinterlace)
+ INSTALL_VIDEOFILTER(ADM_vf_Deinterlace)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/KeepField/CMakeLists.txt~
2009-12-17 18:20:52.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/KeepField/CMakeLists.txt
2009-12-17 18:20:55.059265548 +0200
+@@ -3,27 +3,52 @@
+
+ SET(ADM_vf_separateFieldSRCS ADM_vidSeparateField.cpp)
+ ADD_LIBRARY(ADM_vf_separateField SHARED ${ADM_vf_separateFieldSRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_separateField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_separateField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_separateField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_separateField)
+ INSTALL_VIDEOFILTER(ADM_vf_separateField)
+
+ SET(ADM_vf_mergeFieldSRCS ADM_vidMergeField.cpp)
+ ADD_LIBRARY(ADM_vf_mergeField SHARED ${ADM_vf_mergeFieldSRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_mergeField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mergeField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mergeField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_mergeField)
+ INSTALL_VIDEOFILTER(ADM_vf_mergeField)
+
+ SET(ADM_vf_stackFieldSRCS ADM_vidStackField.cpp)
+ ADD_LIBRARY(ADM_vf_stackField SHARED ${ADM_vf_stackFieldSRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_stackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_stackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_stackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_stackField)
+ INSTALL_VIDEOFILTER(ADM_vf_stackField)
+
+
+ SET(ADM_vf_hzStackFieldSRCS ADM_vidHzStackField.cpp)
+ ADD_LIBRARY(ADM_vf_hzStackField SHARED ${ADM_vf_hzStackFieldSRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_hzStackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_hzStackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_hzStackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_hzStackField)
+ INSTALL_VIDEOFILTER(ADM_vf_hzStackField)
+
+ SET(ADM_vf_unstackFieldSRCS ADM_vidUnstackField.cpp)
+ ADD_LIBRARY(ADM_vf_unstackField SHARED ${ADM_vf_unstackFieldSRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_unstackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_unstackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_unstackField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_unstackField)
+ INSTALL_VIDEOFILTER(ADM_vf_unstackField)
+
+--- avidemux_2.5.1/plugins/ADM_videoFilters/FluxSmooth/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/FluxSmooth/CMakeLists.txt
2009-12-17 18:21:35.355720292 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_FluxSmooth_SRCS ADM_vidFlux.cpp)
+
+ ADD_LIBRARY(ADM_vf_FluxSmooth SHARED ${ADM_vf_FluxSmooth_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_FluxSmooth
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_FluxSmooth
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_FluxSmooth
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ IF (APPLE)
+ TARGET_LINK_LIBRARIES(ADM_vf_FluxSmooth -Wl,-read_only_relocs,suppress)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Stabilize/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Stabilize/CMakeLists.txt
2009-12-17 18:22:02.955717229 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_Stabilize_SRCS ADM_vidStabilize.cpp)
+
+ ADD_LIBRARY(ADM_vf_Stabilize SHARED ${ADM_vf_Stabilize_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_Stabilize
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Stabilize
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Stabilize
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_Stabilize)
+ INSTALL_VIDEOFILTER(ADM_vf_Stabilize)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Mosaic/CMakeLists.txt~
2009-12-17 18:25:10.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Mosaic/CMakeLists.txt
2009-12-17 18:25:13.082781359 +0200
+@@ -1,6 +1,16 @@
+ INCLUDE(vf_plugin)
+ include(admFFmpegUtil)
+
++if (WIN32)
++ set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++ set(LIBAVUTIL_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++ set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++else (WIN32)
++ set(LIBAVCODEC_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec)
++ set(LIBAVUTIL_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavutil)
++ set(LIBSWSCALE_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libswscale)
++endif (WIN32)
++
+ SET(ADM_vf_Mosaic_SRCS ADM_vidMosaic.cpp)
+
+ getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+@@ -8,16 +18,22 @@
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+
+ add_library(ADM_libswscale UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBSWSCALE_LIB}")
++set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION
"${LIBSWSCALE_INSTALL_DIR}/${LIBSWSCALE_LIB}")
+
+ add_library(ADM_libavcodec UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}")
++set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION
"${LIBAVCODEC_INSTALL_DIR}/${LIBAVCODEC_LIB}")
+
+ add_library(ADM_libavutil UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBAVUTIL_LIB}")
++set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION
"${LIBAVUTIL_INSTALL_DIR}/${LIBAVUTIL_LIB}")
+
+ ADD_LIBRARY(ADM_vf_Mosaic SHARED ${ADM_vf_Mosaic_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_vf_Mosaic ADM_libswscale ADM_libavcodec
ADM_libavutil)
+
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_Mosaic
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Mosaic
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Mosaic
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
++
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_Mosaic)
+ INSTALL_VIDEOFILTER(ADM_vf_Mosaic)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Whirl/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Whirl/CMakeLists.txt
2009-12-17 18:25:36.139445701 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_Whirl_SRCS ADM_vidWhirl.cpp)
+
+ ADD_LIBRARY(ADM_vf_Whirl SHARED ${ADM_vf_Whirl_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_Whirl
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Whirl
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_Whirl
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_Whirl)
+ INSTALL_VIDEOFILTER(ADM_vf_Whirl)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/PalShift/CMakeLists.txt~
2009-12-17 18:27:14.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/PalShift/CMakeLists.txt
2009-12-17 18:27:15.889019040 +0200
+@@ -3,12 +3,22 @@
+
+ SET(ADM_vf_palShift_SRCS ADM_vidPalShift.cpp)
+ ADD_LIBRARY(ADM_vf_palShift SHARED ${ADM_vf_palShift_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_palShift
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_palShift
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_palShift
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_palShift)
+ INSTALL_VIDEOFILTER(ADM_vf_palShift)
+
+
+ SET(ADM_vf_smartPalShift_SRCS ADM_vidPalSmart.cpp)
+ ADD_LIBRARY(ADM_vf_smartPalShift SHARED ${ADM_vf_smartPalShift_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_smartPalShift
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_smartPalShift
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_smartPalShift
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_smartPalShift)
+ INSTALL_VIDEOFILTER(ADM_vf_smartPalShift)
+
+--- avidemux_2.5.1/plugins/ADM_videoFilters/SwapField/CMakeLists.txt~
2009-12-17 18:29:24.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/SwapField/CMakeLists.txt
2009-12-17 18:29:27.222755929 +0200
+@@ -3,23 +3,43 @@
+
+ SET(ADM_vf_swapField_SRCS ADM_vidSwapFields.cpp)
+ ADD_LIBRARY(ADM_vf_swapField SHARED ${ADM_vf_swapField_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_swapField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_swapField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_swapField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_swapField)
+ INSTALL_VIDEOFILTER(ADM_vf_swapField)
+
+
+ SET(ADM_vf_smartSwapField_SRCS ADM_vidSwapSmart.cpp)
+ ADD_LIBRARY(ADM_vf_smartSwapField SHARED ${ADM_vf_smartSwapField_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_smartSwapField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_smartSwapField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_smartSwapField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_smartSwapField)
+ INSTALL_VIDEOFILTER(ADM_vf_smartSwapField)
+
+
+ SET(ADM_vf_keepOddField_SRCS ADM_vidKeepOddFields.cpp)
+ ADD_LIBRARY(ADM_vf_keepOddField SHARED ${ADM_vf_keepOddField_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_keepOddField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_keepOddField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_keepOddField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_keepOddField)
+ INSTALL_VIDEOFILTER(ADM_vf_keepOddField)
+
+ SET(ADM_vf_keepEvenField_SRCS ADM_vidKeepEvenFields.cpp)
+ ADD_LIBRARY(ADM_vf_keepEvenField SHARED ${ADM_vf_keepEvenField_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_keepEvenField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_keepEvenField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_keepEvenField
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_keepEvenField)
+ INSTALL_VIDEOFILTER(ADM_vf_keepEvenField)
+
+--- avidemux_2.5.1/plugins/ADM_videoFilters/MSharpen/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/MSharpen/CMakeLists.txt
2009-12-17 18:29:56.839286455 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_mSharpen_SRCS ADM_vidMSharpen.cpp)
+
+ ADD_LIBRARY(ADM_vf_mSharpen SHARED ${ADM_vf_mSharpen_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_mSharpen
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mSharpen
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mSharpen
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_mSharpen)
+ INSTALL_VIDEOFILTER(ADM_vf_mSharpen)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/MSmooth/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/MSmooth/CMakeLists.txt
2009-12-17 18:30:25.092333293 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_mSmooth_SRCS ADM_vidMsmooth.cpp)
+
+ ADD_LIBRARY(ADM_vf_mSmooth SHARED ${ADM_vf_mSmooth_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_mSmooth
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mSmooth
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_mSmooth
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_mSmooth)
+ INSTALL_VIDEOFILTER(ADM_vf_mSmooth)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Soften/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Soften/CMakeLists.txt
2009-12-17 18:30:47.122747898 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_soften_SRCS ADM_vidSoften.cpp)
+
+ ADD_LIBRARY(ADM_vf_soften SHARED ${ADM_vf_soften_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_soften
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_soften
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_soften
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_soften)
+ INSTALL_VIDEOFILTER(ADM_vf_soften)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/lavDeinterlace/CMakeLists.txt~
2009-12-17 18:33:13.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/lavDeinterlace/CMakeLists.txt
2009-12-17 18:33:16.192316325 +0200
+@@ -1,6 +1,14 @@
+ INCLUDE(vf_plugin)
+ include(admFFmpegUtil)
+
++if (WIN32)
++ set(LIBPOSTPROC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++ set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++else (WIN32)
++ set(LIBPOSTPROC_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libpostproc)
++ set(LIBSWSCALE_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libswscale)
++endif (WIN32)
++
+ SET(ADM_vf_lavDeinterlace_SRCS ADM_lavpp_deint.cpp)
+
+ getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+@@ -8,13 +16,18 @@
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+
+ add_library(ADM_libswscale UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBSWSCALE_LIB}")
++set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION
"${LIBSWSCALE_INSTALL_DIR}/${LIBSWSCALE_LIB}")
+
+ add_library(ADM_libpostproc UNKNOWN IMPORTED)
+-set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBPOSTPROC_LIB}")
++set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION
"${LIBPOSTPROC_INSTALL_DIR}/${LIBPOSTPROC_LIB}")
+
+ ADD_LIBRARY(ADM_vf_lavDeinterlace SHARED ${ADM_vf_lavDeinterlace_SRCS})
+ TARGET_LINK_LIBRARIES(ADM_vf_lavDeinterlace ADM_libswscale ADM_libpostproc)
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_lavDeinterlace
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_lavDeinterlace
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_lavDeinterlace
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_lavDeinterlace)
+ INSTALL_VIDEOFILTER(ADM_vf_lavDeinterlace)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Rotate/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Rotate/CMakeLists.txt
2009-12-17 18:35:00.028973213 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_rotate_SRCS ADM_vidRotate.cpp)
+
+ ADD_LIBRARY(ADM_vf_rotate SHARED ${ADM_vf_rotate_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_rotate
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_rotate
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_rotate
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_rotate)
+ INSTALL_VIDEOFILTER(ADM_vf_rotate)
+--- avidemux_2.5.1/plugins/ADM_videoFilters/Tdeint/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_videoFilters/Tdeint/CMakeLists.txt
2009-12-17 18:35:32.682350488 +0200
+@@ -4,6 +4,11 @@
+ SET(ADM_vf_tdeint_SRCS ADM_vidTdeint.cpp DIA_tdeint.cpp )
+
+ ADD_LIBRARY(ADM_vf_tdeint SHARED ${ADM_vf_tdeint_SRCS})
++IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_vf_tdeint
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_tdeint
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_vf_tdeint
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src)
++ENDIF (UNIX)
+
+ INIT_VIDEOFILTER_PLUGIN(ADM_vf_tdeint)
+ INSTALL_VIDEOFILTER(ADM_vf_tdeint)
+--- avidemux_2.5.1/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt~
2009-12-17 18:43:48.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt
2009-12-17 18:43:50.376002948 +0200
+@@ -1,6 +1,12 @@
+ INCLUDE(ae_plugin)
+ include(admFFmpegUtil)
+
++ if (WIN32)
++ set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
++ else (WIN32)
++ set(LIBAVCODEC_INSTALL_DIR
${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec)
++ endif (WIN32)
++
+
getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux")
+
INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg")
+@@ -8,11 +14,16 @@
+ SET(ADM_ae_lav_mp2_SRCS audioencoder_lavcodec.cpp)
+
+ add_library(ADM_libavcodec UNKNOWN IMPORTED)
+- set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION
"${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}")
++ set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION
"${LIBAVCODEC_INSTALL_DIR}/${LIBAVCODEC_LIB}")
+
+ ADD_LIBRARY(ADM_ae_lav_mp2 SHARED ${ADM_ae_lav_mp2_SRCS})
+ ADD_TARGET_CFLAGS(ADM_ae_lav_mp2 "-DADM_LAV_MP2")
+ TARGET_LINK_LIBRARIES(ADM_ae_lav_mp2 ADM_core ADM_coreAudio ADM_coreUI
ADM_libavcodec)
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ae_lav_mp2
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_lav_mp2
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_lav_mp2
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ ENDIF (UNIX)
+
+ INIT_AUDIO_ENCODER(ADM_ae_lav_mp2)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_mp2)
+@@ -22,6 +33,11 @@
+ ADD_LIBRARY(ADM_ae_lav_ac3 SHARED ${ADM_ae_lav_ac3_SRCS})
+ ADD_TARGET_CFLAGS(ADM_ae_lav_ac3 "-DADM_LAV_AC3")
+ TARGET_LINK_LIBRARIES(ADM_ae_lav_ac3 ADM_core ADM_coreAudio ADM_coreUI
ADM_libavcodec)
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ae_lav_ac3
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_lav_ac3
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_lav_ac3
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ ENDIF (UNIX)
+
+ INIT_AUDIO_ENCODER(ADM_ae_lav_ac3)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_ac3)
+--- avidemux_2.5.1/plugins/ADM_audioEncoders/lame/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioEncoders/lame/CMakeLists.txt
2009-12-17 18:44:42.138914394 +0200
+@@ -5,6 +5,11 @@
+ ADD_LIBRARY(ADM_ae_lame SHARED ${ADM_ae_lame_SRCS})
+
+ TARGET_LINK_LIBRARIES(ADM_ae_lame ${LAME_LIBRARY_DIR} ADM_core
ADM_coreAudio ADM_coreUI)
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ae_lame
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_lame
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_lame
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ ENDIF (UNIX)
+
+ ADD_TARGET_CFLAGS(ADM_ae_lame "-I${LAME_INCLUDE_DIR}")
+
+--- avidemux_2.5.1/plugins/ADM_audioEncoders/vorbis/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioEncoders/vorbis/CMakeLists.txt
2009-12-17 18:52:10.085537011 +0200
+@@ -5,6 +5,11 @@
+ ADD_LIBRARY(ADM_ae_vorbis SHARED ${ADM_ae_vorbis_SRCS})
+
+ TARGET_LINK_LIBRARIES(ADM_ae_vorbis ${VORBIS_LIBRARY_DIR}
${VORBISENC_LIBRARY_DIR} ADM_core ADM_coreAudio ADM_coreUI)
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ae_vorbis
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_vorbis
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_vorbis
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ ENDIF (UNIX)
+
+ ADD_TARGET_CFLAGS(ADM_ae_vorbis "-I${VORBIS_INCLUDE_DIR}")
+
+--- avidemux_2.5.1/plugins/ADM_audioEncoders/faac/CMakeLists.txt~
2009-12-17 17:48:16.000000000 +0200
++++ avidemux_2.5.1/plugins/ADM_audioEncoders/faac/CMakeLists.txt
2009-12-17 18:52:49.859490623 +0200
+@@ -5,6 +5,11 @@
+ ADD_LIBRARY(ADM_ae_faac SHARED ${ADM_ae_faac_SRCS})
+
+ TARGET_LINK_LIBRARIES(ADM_ae_faac ${FAAC_LIBRARY_DIR} ADM_core
ADM_coreAudio ADM_coreUI)
++ IF (UNIX)
++ ADD_TARGET_LDFLAGS(ADM_ae_faac
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_faac
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src)
++ ADD_TARGET_LDFLAGS(ADM_ae_faac
-L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src)
++ ENDIF (UNIX)
+
+ ADD_TARGET_CFLAGS(ADM_ae_faac "-I${FAAC_INCLUDE_DIR}")
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/link-libs.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
