]>
Commit | Line | Data |
---|---|---|
0c9c2362 ER |
1 | --- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/CMakeLists.txt~ 2009-12-17 15:36:24.000000000 +0200 |
2 | +++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/CMakeLists.txt 2009-12-17 15:36:27.450044797 +0200 | |
3 | @@ -11,6 +11,10 @@ | |
4 | ADD_TARGET_CFLAGS(${ADM_LIB} -fPIC) | |
5 | ENDIF (UNIX) | |
6 | ||
7 | +IF (UNIX) | |
8 | + ADD_TARGET_LDFLAGS(${ADM_LIB} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
9 | +ENDIF (UNIX) | |
10 | + | |
11 | IF (ADM_BIG_ENDIAN) | |
12 | ADD_TARGET_CFLAGS(${ADM_LIB} -DWORDS_BIGENDIAN) | |
13 | ENDIF (ADM_BIG_ENDIAN) | |
14 | --- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt~ 2009-12-17 15:38:27.000000000 +0200 | |
15 | +++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2009-12-17 15:38:30.803364774 +0200 | |
16 | @@ -7,5 +7,11 @@ | |
17 | ADD_LIBRARY(ADM_ad_a52 SHARED ${ADM_ad_a52_SRCS}) | |
18 | TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52) | |
19 | ||
20 | + | |
21 | +IF (UNIX) | |
22 | + ADD_TARGET_LDFLAGS(ADM_ad_a52 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
23 | +ENDIF (UNIX) | |
24 | + | |
25 | + | |
26 | INIT_AUDIO_PLUGIN(ADM_ad_a52) | |
27 | INSTALL_AUDIODECODER(ADM_ad_a52) | |
28 | --- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_faad/CMakeLists.txt~ 2008-07-19 19:12:51.000000000 +0300 | |
29 | +++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_faad/CMakeLists.txt 2009-12-17 15:42:30.613341120 +0200 | |
30 | @@ -12,6 +12,10 @@ | |
31 | ADD_TARGET_CFLAGS(ADM_ad_faad "-I${FAAD_INCLUDE_DIR}") | |
32 | ADD_TARGET_DEFINITIONS(ADM_ad_faad FAAD_OLD_PROTOTYPE) | |
33 | ||
34 | + IF (UNIX) | |
35 | + ADD_TARGET_LDFLAGS(ADM_ad_faad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
36 | + ENDIF (UNIX) | |
37 | + | |
38 | INIT_AUDIO_PLUGIN(ADM_ad_faad) | |
39 | INSTALL_AUDIODECODER(ADM_ad_faad) | |
40 | ENDIF (USE_FAAD) | |
41 | --- avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt~ 2009-12-17 15:46:23.000000000 +0200 | |
42 | +++ avidemux_2.5.1/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2009-12-17 15:46:27.003402821 +0200 | |
43 | @@ -15,5 +15,9 @@ | |
44 | ADD_LIBRARY(ADM_ad_Mad SHARED ${ADM_ad_Mad_SRCS}) | |
45 | TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad) | |
46 | ||
47 | +IF (UNIX) | |
48 | + ADD_TARGET_LDFLAGS(ADM_ad_Mad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
49 | +ENDIF (UNIX) | |
50 | + | |
51 | INIT_AUDIO_PLUGIN(ADM_ad_Mad) | |
52 | INSTALL_AUDIODECODER(ADM_ad_Mad) | |
53 | --- avidemux_2.5.1/plugins/ADM_audioDevices/Alsa/CMakeLists.txt~ 2009-12-17 15:51:36.000000000 +0200 | |
54 | +++ avidemux_2.5.1/plugins/ADM_audioDevices/Alsa/CMakeLists.txt 2009-12-17 15:51:38.233702776 +0200 | |
55 | @@ -6,5 +6,10 @@ | |
56 | ADD_LIBRARY(ADM_av_alsa SHARED ${ADM_av_alsa_SRCS}) | |
57 | TARGET_LINK_LIBRARIES(ADM_av_alsa ADM_core ADM_coreAudio ${ASOUND_LIBRARY}) | |
58 | ||
59 | +IF (UNIX) | |
60 | + ADD_TARGET_LDFLAGS(ADM_av_alsa -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
61 | + ADD_TARGET_LDFLAGS(ADM_av_alsa -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
62 | +ENDIF (UNIX) | |
63 | + | |
64 | INIT_AUDIO_DEVICE(ADM_av_alsa) | |
65 | INSTALL_AUDIODEVICE(ADM_av_alsa) | |
66 | --- avidemux_2.5.1/plugins/ADM_audioDevices/Esd/CMakeLists.txt~ 2009-12-17 15:52:44.000000000 +0200 | |
67 | +++ avidemux_2.5.1/plugins/ADM_audioDevices/Esd/CMakeLists.txt 2009-12-17 15:52:46.610287000 +0200 | |
68 | @@ -7,6 +7,10 @@ | |
69 | INCLUDE_DIRECTORIES(${ESD_INCLUDE_DIR}) | |
70 | TARGET_LINK_LIBRARIES(ADM_av_esd ADM_coreAudio ${ESD_LIBRARY_DIR}) | |
71 | ||
72 | +IF (UNIX) | |
73 | + ADD_TARGET_LDFLAGS(ADM_av_esd -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
74 | + ADD_TARGET_LDFLAGS(ADM_av_esd -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
75 | +ENDIF (UNIX) | |
76 | ||
77 | INIT_AUDIO_DEVICE(ADM_av_esd) | |
78 | INSTALL_AUDIODEVICE(ADM_av_esd) | |
79 | --- avidemux_2.5.1/plugins/ADM_audioDevices/Sdl/CMakeLists.txt~ 2009-12-17 15:54:06.000000000 +0200 | |
80 | +++ avidemux_2.5.1/plugins/ADM_audioDevices/Sdl/CMakeLists.txt 2009-12-17 15:54:08.130354565 +0200 | |
81 | @@ -5,6 +5,12 @@ | |
82 | ||
83 | ADD_LIBRARY(ADM_av_sdl SHARED ${ADM_av_sdl_SRCS}) | |
84 | TARGET_LINK_LIBRARIES(ADM_av_sdl ADM_core ADM_coreAudio ${SDL_LIBRARY}) | |
85 | + | |
86 | +IF (UNIX) | |
87 | + ADD_TARGET_LDFLAGS(ADM_av_sdl -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
88 | + ADD_TARGET_LDFLAGS(ADM_av_sdl -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
89 | +ENDIF (UNIX) | |
90 | + | |
91 | SDLify(ADM_deviceSDL.cpp) | |
92 | ||
93 | INIT_AUDIO_DEVICE(ADM_av_sdl) | |
94 | --- avidemux_2.5.1/plugins/ADM_audioDevices/Oss/CMakeLists.txt~ 2009-12-17 15:55:02.000000000 +0200 | |
95 | +++ avidemux_2.5.1/plugins/ADM_audioDevices/Oss/CMakeLists.txt 2009-12-17 15:55:04.413265947 +0200 | |
96 | @@ -6,5 +6,11 @@ | |
97 | ADD_LIBRARY(ADM_av_oss SHARED ${ADM_av_oss_SRCS}) | |
98 | TARGET_LINK_LIBRARIES(ADM_av_oss ADM_coreAudio) | |
99 | include_directories(${OSS_INCLUDE_DIR}) | |
100 | + | |
101 | +IF (UNIX) | |
102 | + ADD_TARGET_LDFLAGS(ADM_av_oss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
103 | + ADD_TARGET_LDFLAGS(ADM_av_oss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
104 | +ENDIF (UNIX) | |
105 | + | |
106 | INIT_AUDIO_DEVICE(ADM_av_oss) | |
107 | INSTALL_AUDIODEVICE(ADM_av_oss) | |
108 | --- avidemux_2.5.1/plugins/ADM_audioDevices/Arts/CMakeLists.txt~ 2009-07-11 11:05:39.000000000 +0300 | |
109 | +++ avidemux_2.5.1/plugins/ADM_audioDevices/Arts/CMakeLists.txt 2009-12-17 15:55:24.563263514 +0200 | |
110 | @@ -6,5 +6,11 @@ | |
111 | ADD_LIBRARY(ADM_av_arts SHARED ${ADM_av_arts_SRCS}) | |
112 | TARGET_LINK_LIBRARIES(ADM_av_arts ADM_coreAudio ${ARTS_LDFLAGS}) | |
113 | ADD_DEFINITIONS(${ARTS_CFLAGS}) | |
114 | + | |
115 | +IF (UNIX) | |
116 | + ADD_TARGET_LDFLAGS(ADM_av_arts -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
117 | + ADD_TARGET_LDFLAGS(ADM_av_arts -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
118 | +ENDIF (UNIX) | |
119 | + | |
120 | INIT_AUDIO_DEVICE(ADM_av_arts) | |
121 | INSTALL_AUDIODEVICE(ADM_av_arts) | |
122 | --- avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/CMakeLists.txt~ 2009-12-17 16:26:26.000000000 +0200 | |
123 | +++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/CMakeLists.txt 2009-12-17 16:26:42.886825636 +0200 | |
124 | @@ -5,7 +5,7 @@ | |
125 | if (WIN32) | |
126 | set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
127 | else (WIN32) | |
128 | - set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib) | |
129 | + set(FFMPEG_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec) | |
130 | endif (WIN32) | |
131 | ||
132 | SET(ADM_vidEnc_avcodec_SRCS interface.c encoder.cpp huffyuvEncoder.cpp | |
133 | @@ -27,6 +27,11 @@ | |
134 | ADD_LIBRARY(ADM_vidEnc_avcodec SHARED ${ADM_vidEnc_avcodec_SRCS}) | |
135 | TARGET_LINK_LIBRARIES(ADM_vidEnc_avcodec ${LIBXML2_LIBRARIES} ADM_core ADM_coreUI ADM_libavcodec) | |
136 | ||
137 | +IF (UNIX) | |
138 | + ADD_TARGET_LDFLAGS(ADM_vidEnc_avcodec -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
139 | + ADD_TARGET_LDFLAGS(ADM_vidEnc_avcodec -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
140 | +ENDIF (UNIX) | |
141 | + | |
142 | INIT_VIDEO_ENCODER_PLUGIN(ADM_vidEnc_avcodec) | |
143 | INSTALL_VIDEO_ENCODER(ADM_vidEnc_avcodec) | |
144 | INSTALL(FILES Mpeg1Param.xsd DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}") | |
145 | --- avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
146 | +++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/CMakeLists.txt 2009-12-17 16:27:38.943287786 +0200 | |
147 | @@ -25,8 +25,12 @@ | |
148 | ADD_LIBRARY(ADM_vidEnc_xvid SHARED ${ADM_vidEnc_xvid_SRCS}) | |
149 | TARGET_LINK_LIBRARIES(ADM_vidEnc_xvid ADM_core ${XVID_LIBRARY_DIR} ${LIBXML2_LIBRARIES}) | |
150 | ||
151 | + IF (UNIX) | |
152 | + ADD_TARGET_LDFLAGS(ADM_vidEnc_xvid -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
153 | + ENDIF (UNIX) | |
154 | + | |
155 | INIT_VIDEO_ENCODER_PLUGIN(ADM_vidEnc_xvid) | |
156 | INSTALL_VIDEO_ENCODER(ADM_vidEnc_xvid) | |
157 | INSTALL(FILES XvidParam.xsd DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}") | |
158 | ENDIF (LIBXML2_FOUND) | |
159 | -ENDIF (XVID_FOUND) | |
160 | \ No newline at end of file | |
161 | +ENDIF (XVID_FOUND) | |
162 | --- avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
163 | +++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/CMakeLists.txt 2009-12-17 16:30:35.576440406 +0200 | |
164 | @@ -15,6 +15,11 @@ | |
165 | ADD_LIBRARY(${QT_PLUGIN_NAME} SHARED ${ADM_vidEnc_xvid_Qt_SRCS}) | |
166 | TARGET_LINK_LIBRARIES(${QT_PLUGIN_NAME} ADM_vidEnc_xvid ADM_coreUI ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}) | |
167 | ||
168 | + IF (UNIX) | |
169 | + ADD_TARGET_LDFLAGS(${QT_PLUGIN_NAME} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
170 | + ADD_TARGET_LDFLAGS(${QT_PLUGIN_NAME} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
171 | + ENDIF (UNIX) | |
172 | + | |
173 | INIT_VIDEO_ENCODER_PLUGIN(${QT_PLUGIN_NAME}) | |
174 | INSTALL(TARGETS ${QT_PLUGIN_NAME} DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}") | |
175 | -ENDIF (QT4_FOUND) | |
176 | \ No newline at end of file | |
177 | +ENDIF (QT4_FOUND) | |
178 | --- avidemux_2.5.1/plugins/ADM_videoFilters/AddBorders/CMakeLists.txt~ 2009-12-17 16:32:26.000000000 +0200 | |
179 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/AddBorders/CMakeLists.txt 2009-12-17 16:32:28.803457882 +0200 | |
180 | @@ -5,5 +5,11 @@ | |
181 | ||
182 | ADD_LIBRARY(ADM_vf_addborders SHARED ${ADM_vf_addborders_SRCS}) | |
183 | ||
184 | +IF (UNIX) | |
185 | + ADD_TARGET_LDFLAGS(ADM_vf_addborders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
186 | + ADD_TARGET_LDFLAGS(ADM_vf_addborders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
187 | + ADD_TARGET_LDFLAGS(ADM_vf_addborders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
188 | +ENDIF (UNIX) | |
189 | + | |
190 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_addborders) | |
191 | INSTALL_VIDEOFILTER(ADM_vf_addborders) | |
192 | --- avidemux_2.5.1/plugins/ADM_videoFilters/BlendRemover/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
193 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/BlendRemover/CMakeLists.txt 2009-12-17 16:32:58.936469874 +0200 | |
194 | @@ -6,5 +6,11 @@ | |
195 | ADD_LIBRARY(ADM_vf_blendRemoval SHARED ${ADM_vf_blendRemoval_SRCS}) | |
196 | TARGET_LINK_LIBRARIES(ADM_vf_blendRemoval ADM_coreImage) | |
197 | ||
198 | +IF (UNIX) | |
199 | + ADD_TARGET_LDFLAGS(ADM_vf_blendRemoval -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
200 | + ADD_TARGET_LDFLAGS(ADM_vf_blendRemoval -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
201 | + ADD_TARGET_LDFLAGS(ADM_vf_blendRemoval -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
202 | +ENDIF (UNIX) | |
203 | + | |
204 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_blendRemoval) | |
205 | INSTALL_VIDEOFILTER(ADM_vf_blendRemoval) | |
206 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Chroma/CMakeLists.txt~ 2009-12-17 16:34:54.000000000 +0200 | |
207 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Chroma/CMakeLists.txt 2009-12-17 16:34:56.539901179 +0200 | |
208 | @@ -3,11 +3,23 @@ | |
209 | ||
210 | SET(ADM_vidChromaU_SRCS ADM_vidChromaU.cpp) | |
211 | ADD_LIBRARY(ADM_vidChromaU SHARED ${ADM_vidChromaU_SRCS}) | |
212 | +IF (UNIX) | |
213 | + ADD_TARGET_LDFLAGS(ADM_vidChromaU -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
214 | + ADD_TARGET_LDFLAGS(ADM_vidChromaU -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
215 | + ADD_TARGET_LDFLAGS(ADM_vidChromaU -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
216 | +ENDIF (UNIX) | |
217 | + | |
218 | INIT_VIDEOFILTER_PLUGIN(ADM_vidChromaU) | |
219 | INSTALL_VIDEOFILTER(ADM_vidChromaU) | |
220 | ||
221 | - | |
222 | SET(ADM_vidChromaV_SRCS ADM_vidChromaV.cpp) | |
223 | ADD_LIBRARY(ADM_vidChromaV SHARED ${ADM_vidChromaV_SRCS}) | |
224 | + | |
225 | +IF (UNIX) | |
226 | + ADD_TARGET_LDFLAGS(ADM_vidChromaV -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
227 | + ADD_TARGET_LDFLAGS(ADM_vidChromaV -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
228 | + ADD_TARGET_LDFLAGS(ADM_vidChromaV -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
229 | +ENDIF (UNIX) | |
230 | + | |
231 | INIT_VIDEOFILTER_PLUGIN(ADM_vidChromaV) | |
232 | INSTALL_VIDEOFILTER(ADM_vidChromaV) | |
233 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Decimate/CMakeLists.txt~ 2009-12-17 16:35:47.000000000 +0200 | |
234 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Decimate/CMakeLists.txt 2009-12-17 16:35:50.369688318 +0200 | |
235 | @@ -5,6 +5,12 @@ | |
236 | ||
237 | ADD_LIBRARY(ADM_vf_decimate SHARED ${ADM_vf_decimate_SRCS}) | |
238 | ||
239 | +IF (UNIX) | |
240 | + ADD_TARGET_LDFLAGS(ADM_vf_decimate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
241 | + ADD_TARGET_LDFLAGS(ADM_vf_decimate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
242 | + ADD_TARGET_LDFLAGS(ADM_vf_decimate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
243 | +ENDIF (UNIX) | |
244 | + | |
245 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_decimate) | |
246 | INSTALL_VIDEOFILTER(ADM_vf_decimate) | |
247 | ||
248 | --- avidemux_2.5.1/plugins/ADM_videoFilters/DgBob/CMakeLists.txt~ 2009-12-17 16:36:53.000000000 +0200 | |
249 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/DgBob/CMakeLists.txt 2009-12-17 16:36:56.800305942 +0200 | |
250 | @@ -5,5 +5,11 @@ | |
251 | ||
252 | ADD_LIBRARY(ADM_vf_blendDgBob SHARED ${ADM_vf_blendDgBob_SRCS}) | |
253 | ||
254 | +IF (UNIX) | |
255 | + ADD_TARGET_LDFLAGS(ADM_vf_blendDgBob -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
256 | + ADD_TARGET_LDFLAGS(ADM_vf_blendDgBob -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
257 | + ADD_TARGET_LDFLAGS(ADM_vf_blendDgBob -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
258 | +ENDIF (UNIX) | |
259 | + | |
260 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_blendDgBob) | |
261 | INSTALL_VIDEOFILTER(ADM_vf_blendDgBob) | |
262 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Fade/CMakeLists.txt~ 2009-12-17 16:45:28.000000000 +0200 | |
263 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Fade/CMakeLists.txt 2009-12-17 16:45:30.743171303 +0200 | |
264 | @@ -5,5 +5,11 @@ | |
265 | ||
266 | ADD_LIBRARY(ADM_vf_fade SHARED ${ADM_vf_fade_SRCS}) | |
267 | ||
268 | +IF (UNIX) | |
269 | + ADD_TARGET_LDFLAGS(ADM_vf_fade -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
270 | + ADD_TARGET_LDFLAGS(ADM_vf_fade -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
271 | + ADD_TARGET_LDFLAGS(ADM_vf_fade -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
272 | +ENDIF (UNIX) | |
273 | + | |
274 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_fade) | |
275 | INSTALL_VIDEOFILTER(ADM_vf_fade) | |
276 | --- avidemux_2.5.1/plugins/ADM_videoFilters/FastConvolution/CMakeLists.txt~ 2009-12-17 16:49:24.000000000 +0200 | |
277 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/FastConvolution/CMakeLists.txt 2009-12-17 16:49:27.543010217 +0200 | |
278 | @@ -3,21 +3,41 @@ | |
279 | ||
280 | SET(ADM_vf_fastconvolutionmean_SRCS ADM_vidFastConvolution.cpp Mean.cpp ) | |
281 | ADD_LIBRARY(ADM_vf_fastconvolutionmean SHARED ${ADM_vf_fastconvolutionmean_SRCS}) | |
282 | +IF (UNIX) | |
283 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmean -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
284 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmean -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
285 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmean -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
286 | +ENDIF (UNIX) | |
287 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutionmean) | |
288 | INSTALL_VIDEOFILTER(ADM_vf_fastconvolutionmean) | |
289 | ||
290 | SET(ADM_vf_fastconvolutiongauss_SRCS ADM_vidFastConvolution.cpp Gauss.cpp ) | |
291 | ADD_LIBRARY(ADM_vf_fastconvolutiongauss SHARED ${ADM_vf_fastconvolutiongauss_SRCS}) | |
292 | +IF (UNIX) | |
293 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutiongauss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
294 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutiongauss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
295 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutiongauss -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
296 | +ENDIF (UNIX) | |
297 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutiongauss) | |
298 | INSTALL_VIDEOFILTER(ADM_vf_fastconvolutiongauss) | |
299 | ||
300 | SET(ADM_vf_fastconvolutionmedian_SRCS ADM_vidFastConvolution.cpp Median.cpp ) | |
301 | ADD_LIBRARY(ADM_vf_fastconvolutionmedian SHARED ${ADM_vf_fastconvolutionmedian_SRCS}) | |
302 | +IF (UNIX) | |
303 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
304 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
305 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionmedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
306 | +ENDIF (UNIX) | |
307 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutionmedian) | |
308 | INSTALL_VIDEOFILTER(ADM_vf_fastconvolutionmedian) | |
309 | ||
310 | SET(ADM_vf_fastconvolutionsharpen_SRCS ADM_vidFastConvolution.cpp Sharpen.cpp ) | |
311 | ADD_LIBRARY(ADM_vf_fastconvolutionsharpen SHARED ${ADM_vf_fastconvolutionsharpen_SRCS}) | |
312 | +IF (UNIX) | |
313 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionsharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
314 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionsharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
315 | + ADD_TARGET_LDFLAGS(ADM_vf_fastconvolutionsharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
316 | +ENDIF (UNIX) | |
317 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_fastconvolutionsharpen) | |
318 | INSTALL_VIDEOFILTER(ADM_vf_fastconvolutionsharpen) | |
319 | ||
320 | --- avidemux_2.5.1/plugins/ADM_videoFilters/ForcedPP/CMakeLists.txt~ 2009-12-17 16:59:26.000000000 +0200 | |
321 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/ForcedPP/CMakeLists.txt 2009-12-17 16:59:30.443295685 +0200 | |
322 | @@ -1,16 +1,27 @@ | |
323 | INCLUDE(vf_plugin) | |
324 | include(admFFmpegUtil) | |
325 | ||
326 | +if (WIN32) | |
327 | + set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
328 | +else (WIN32) | |
329 | + set(FFMPEG_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libpostproc) | |
330 | +endif (WIN32) | |
331 | + | |
332 | getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
333 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
334 | ||
335 | SET(ADM_vf_forcedPP_SRCS ADM_vidForcedPP.cpp) | |
336 | ||
337 | add_library(ADM_libpostproc UNKNOWN IMPORTED) | |
338 | -set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBPOSTPROC_LIB}") | |
339 | +set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${FFMPEG_INSTALL_DIR}/${LIBPOSTPROC_LIB}") | |
340 | ||
341 | ADD_LIBRARY(ADM_vf_forcedPP SHARED ${ADM_vf_forcedPP_SRCS}) | |
342 | TARGET_LINK_LIBRARIES(ADM_vf_forcedPP ADM_libpostproc) | |
343 | +IF (UNIX) | |
344 | + ADD_TARGET_LDFLAGS(ADM_vf_forcedPP -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
345 | + ADD_TARGET_LDFLAGS(ADM_vf_forcedPP -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
346 | + ADD_TARGET_LDFLAGS(ADM_vf_forcedPP -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
347 | +ENDIF (UNIX) | |
348 | ||
349 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_forcedPP) | |
350 | INSTALL_VIDEOFILTER(ADM_vf_forcedPP) | |
351 | --- avidemux_2.5.1/plugins/ADM_videoFilters/LargeMedian/CMakeLists.txt~ 2009-12-17 17:00:31.000000000 +0200 | |
352 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/LargeMedian/CMakeLists.txt 2009-12-17 17:00:34.886414147 +0200 | |
353 | @@ -4,6 +4,11 @@ | |
354 | SET(ADM_vf_largemedian_SRCS ADM_vidLargeMedian.cpp) | |
355 | ||
356 | ADD_LIBRARY(ADM_vf_largemedian SHARED ${ADM_vf_largemedian_SRCS}) | |
357 | +IF (UNIX) | |
358 | + ADD_TARGET_LDFLAGS(ADM_vf_largemedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
359 | + ADD_TARGET_LDFLAGS(ADM_vf_largemedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
360 | + ADD_TARGET_LDFLAGS(ADM_vf_largemedian -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
361 | +ENDIF (UNIX) | |
362 | ||
363 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_largemedian) | |
364 | INSTALL_VIDEOFILTER(ADM_vf_largemedian) | |
365 | --- avidemux_2.5.1/plugins/ADM_videoFilters/LumaOnly/CMakeLists.txt~ 2009-12-17 17:01:21.000000000 +0200 | |
366 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/LumaOnly/CMakeLists.txt 2009-12-17 17:01:23.986409287 +0200 | |
367 | @@ -4,6 +4,11 @@ | |
368 | SET(ADM_vf_lumaonly_SRCS ADM_vidLuma.cpp) | |
369 | ||
370 | ADD_LIBRARY(ADM_vf_lumaonly SHARED ${ADM_vf_lumaonly_SRCS}) | |
371 | +IF (UNIX) | |
372 | + ADD_TARGET_LDFLAGS(ADM_vf_lumaonly -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
373 | + ADD_TARGET_LDFLAGS(ADM_vf_lumaonly -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
374 | + ADD_TARGET_LDFLAGS(ADM_vf_lumaonly -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
375 | +ENDIF (UNIX) | |
376 | ||
377 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_lumaonly) | |
378 | INSTALL_VIDEOFILTER(ADM_vf_lumaonly) | |
379 | --- avidemux_2.5.1/plugins/ADM_videoFilters/McDeint/CMakeLists.txt~ 2009-12-17 17:03:45.000000000 +0200 | |
380 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/McDeint/CMakeLists.txt 2009-12-17 17:03:48.106448547 +0200 | |
381 | @@ -1,16 +1,27 @@ | |
382 | INCLUDE(vf_plugin) | |
383 | include(admFFmpegUtil) | |
384 | ||
385 | +if (WIN32) | |
386 | + set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
387 | +else (WIN32) | |
388 | + set(FFMPEG_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec) | |
389 | +endif (WIN32) | |
390 | + | |
391 | getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
392 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux") | |
393 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
394 | SET(ADM_vf_mcdeint_SRCS ADM_vidMcDeint.cpp) | |
395 | ||
396 | add_library(ADM_libavcodec UNKNOWN IMPORTED) | |
397 | -set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}") | |
398 | +set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_INSTALL_DIR}/${LIBAVCODEC_LIB}") | |
399 | ||
400 | ADD_LIBRARY(ADM_vf_mcdeint SHARED ${ADM_vf_mcdeint_SRCS}) | |
401 | TARGET_LINK_LIBRARIES(ADM_vf_mcdeint ADM_libavcodec) | |
402 | +IF (UNIX) | |
403 | + ADD_TARGET_LDFLAGS(ADM_vf_mcdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
404 | + ADD_TARGET_LDFLAGS(ADM_vf_mcdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
405 | + ADD_TARGET_LDFLAGS(ADM_vf_mcdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
406 | +ENDIF (UNIX) | |
407 | ||
408 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_mcdeint) | |
409 | INSTALL_VIDEOFILTER(ADM_vf_mcdeint) | |
410 | --- avidemux_2.5.1/plugins/ADM_videoFilters/MplayerDenoise3D/CMakeLists.txt~ 2009-12-17 17:06:04.000000000 +0200 | |
411 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/MplayerDenoise3D/CMakeLists.txt 2009-12-17 17:06:06.739560739 +0200 | |
412 | @@ -3,10 +3,20 @@ | |
413 | ||
414 | SET(ADM_vf_denoise3dhq_SRCS ADM_vidMPLD3D.cpp) | |
415 | ADD_LIBRARY(ADM_vf_denoise3dhq SHARED ${ADM_vf_denoise3dhq_SRCS}) | |
416 | +IF (UNIX) | |
417 | + ADD_TARGET_LDFLAGS(ADM_vf_denoise3dhq -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
418 | + ADD_TARGET_LDFLAGS(ADM_vf_denoise3dhq -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
419 | + ADD_TARGET_LDFLAGS(ADM_vf_denoise3dhq -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
420 | +ENDIF (UNIX) | |
421 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_denoise3dhq) | |
422 | INSTALL_VIDEOFILTER(ADM_vf_denoise3dhq) | |
423 | ||
424 | SET(ADM_vf_denoise3d_SRCS ADM_vidMPLD3Dlow.cpp) | |
425 | ADD_LIBRARY(ADM_vf_denoise3d SHARED ${ADM_vf_denoise3d_SRCS}) | |
426 | +IF (UNIX) | |
427 | + ADD_TARGET_LDFLAGS(ADM_vf_denoise3d -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
428 | + ADD_TARGET_LDFLAGS(ADM_vf_denoise3d -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
429 | + ADD_TARGET_LDFLAGS(ADM_vf_denoise3d -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
430 | +ENDIF (UNIX) | |
431 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_denoise3d) | |
432 | INSTALL_VIDEOFILTER(ADM_vf_denoise3d) | |
433 | --- avidemux_2.5.1/plugins/ADM_videoFilters/ResampleFps/CMakeLists.txt~ 2009-12-17 17:06:57.000000000 +0200 | |
434 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/ResampleFps/CMakeLists.txt 2009-12-17 17:07:00.326375723 +0200 | |
435 | @@ -9,5 +9,11 @@ | |
436 | TARGET_LINK_LIBRARIES(ADM_vf_resampleFps -Wl,-read_only_relocs,suppress) | |
437 | ENDIF (APPLE) | |
438 | ||
439 | +IF (UNIX) | |
440 | + ADD_TARGET_LDFLAGS(ADM_vf_resampleFps -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
441 | + ADD_TARGET_LDFLAGS(ADM_vf_resampleFps -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
442 | + ADD_TARGET_LDFLAGS(ADM_vf_resampleFps -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
443 | +ENDIF (UNIX) | |
444 | + | |
445 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_resampleFps) | |
446 | INSTALL_VIDEOFILTER(ADM_vf_resampleFps) | |
447 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Reverse/CMakeLists.txt~ 2009-12-17 17:25:35.000000000 +0200 | |
448 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Reverse/CMakeLists.txt 2009-12-17 17:25:37.086056172 +0200 | |
449 | @@ -4,6 +4,11 @@ | |
450 | SET(ADM_vf_reverse_SRCS ADM_vidReverse.cpp) | |
451 | ||
452 | ADD_LIBRARY(ADM_vf_reverse SHARED ${ADM_vf_reverse_SRCS}) | |
453 | +IF (UNIX) | |
454 | + ADD_TARGET_LDFLAGS(ADM_vf_reverse -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
455 | + ADD_TARGET_LDFLAGS(ADM_vf_reverse -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
456 | + ADD_TARGET_LDFLAGS(ADM_vf_reverse -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
457 | +ENDIF (UNIX) | |
458 | ||
459 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_reverse) | |
460 | INSTALL_VIDEOFILTER(ADM_vf_reverse) | |
461 | --- avidemux_2.5.1/plugins/ADM_videoFilters/SwapUV/CMakeLists.txt~ 2009-12-17 17:26:46.000000000 +0200 | |
462 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/SwapUV/CMakeLists.txt 2009-12-17 17:26:48.249381855 +0200 | |
463 | @@ -4,6 +4,11 @@ | |
464 | SET(ADM_vf_swapuv_SRCS ADM_vidUVSwap.cpp) | |
465 | ||
466 | ADD_LIBRARY(ADM_vf_swapuv SHARED ${ADM_vf_swapuv_SRCS}) | |
467 | +IF (UNIX) | |
468 | + ADD_TARGET_LDFLAGS(ADM_vf_swapuv -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
469 | + ADD_TARGET_LDFLAGS(ADM_vf_swapuv -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
470 | + ADD_TARGET_LDFLAGS(ADM_vf_swapuv -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
471 | +ENDIF (UNIX) | |
472 | ||
473 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_swapuv) | |
474 | INSTALL_VIDEOFILTER(ADM_vf_swapuv) | |
475 | --- avidemux_2.5.1/plugins/ADM_videoFilters/TemporalCleaner/CMakeLists.txt~ 2009-12-17 17:35:01.000000000 +0200 | |
476 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/TemporalCleaner/CMakeLists.txt 2009-12-17 17:35:03.452873917 +0200 | |
477 | @@ -4,6 +4,11 @@ | |
478 | SET(ADM_vf_vlad_SRCS ADM_vidVlad.cpp) | |
479 | ||
480 | ADD_LIBRARY(ADM_vf_vlad SHARED ${ADM_vf_vlad_SRCS}) | |
481 | +IF (UNIX) | |
482 | + ADD_TARGET_LDFLAGS(ADM_vf_vlad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
483 | + ADD_TARGET_LDFLAGS(ADM_vf_vlad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
484 | + ADD_TARGET_LDFLAGS(ADM_vf_vlad -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
485 | +ENDIF (UNIX) | |
486 | ||
487 | IF (UNIX AND ADM_DEBUG) | |
488 | ADD_DEFINITIONS(-O2) | |
489 | --- avidemux_2.5.1/plugins/ADM_videoFilters/VerticalFlip/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
490 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/VerticalFlip/CMakeLists.txt 2009-12-17 17:36:00.469534995 +0200 | |
491 | @@ -4,6 +4,11 @@ | |
492 | SET(ADM_vf_vflip_SRCS ADM_vidFlipV.cpp) | |
493 | ||
494 | ADD_LIBRARY(ADM_vf_vflip SHARED ${ADM_vf_vflip_SRCS}) | |
495 | +IF (UNIX) | |
496 | + ADD_TARGET_LDFLAGS(ADM_vf_vflip -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
497 | + ADD_TARGET_LDFLAGS(ADM_vf_vflip -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
498 | + ADD_TARGET_LDFLAGS(ADM_vf_vflip -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
499 | +ENDIF (UNIX) | |
500 | ||
501 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_vflip) | |
502 | INSTALL_VIDEOFILTER(ADM_vf_vflip) | |
503 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Yadif/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
504 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Yadif/CMakeLists.txt 2009-12-17 17:36:24.849324488 +0200 | |
505 | @@ -4,6 +4,11 @@ | |
506 | SET(ADM_vf_yadif_SRCS ADM_vidYadif_asm.c ADM_vidYadif.cpp ) | |
507 | ||
508 | ADD_LIBRARY(ADM_vf_yadif SHARED ${ADM_vf_yadif_SRCS}) | |
509 | +IF (UNIX) | |
510 | + ADD_TARGET_LDFLAGS(ADM_vf_yadif -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
511 | + ADD_TARGET_LDFLAGS(ADM_vf_yadif -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
512 | + ADD_TARGET_LDFLAGS(ADM_vf_yadif -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
513 | +ENDIF (UNIX) | |
514 | ||
515 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_yadif) | |
516 | INSTALL_VIDEOFILTER(ADM_vf_yadif) | |
517 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Pulldown/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
518 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Pulldown/CMakeLists.txt 2009-12-17 17:36:46.872728122 +0200 | |
519 | @@ -4,6 +4,11 @@ | |
520 | SET(ADM_vf_Pulldown_SRCS ADM_vidPulldown.cpp) | |
521 | ||
522 | ADD_LIBRARY(ADM_vf_Pulldown SHARED ${ADM_vf_Pulldown_SRCS}) | |
523 | +IF (UNIX) | |
524 | + ADD_TARGET_LDFLAGS(ADM_vf_Pulldown -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
525 | + ADD_TARGET_LDFLAGS(ADM_vf_Pulldown -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
526 | + ADD_TARGET_LDFLAGS(ADM_vf_Pulldown -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
527 | +ENDIF (UNIX) | |
528 | ||
529 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Pulldown) | |
530 | INSTALL_VIDEOFILTER(ADM_vf_Pulldown) | |
531 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Denoise/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
532 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Denoise/CMakeLists.txt 2009-12-17 17:37:53.402654521 +0200 | |
533 | @@ -4,6 +4,11 @@ | |
534 | SET(ADM_vf_Denoise_SRCS ADM_vidDenoise.cpp) | |
535 | ||
536 | ADD_LIBRARY(ADM_vf_Denoise SHARED ${ADM_vf_Denoise_SRCS}) | |
537 | +IF (UNIX) | |
538 | + ADD_TARGET_LDFLAGS(ADM_vf_Denoise -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
539 | + ADD_TARGET_LDFLAGS(ADM_vf_Denoise -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
540 | + ADD_TARGET_LDFLAGS(ADM_vf_Denoise -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
541 | +ENDIF (UNIX) | |
542 | ||
543 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Denoise) | |
544 | INSTALL_VIDEOFILTER(ADM_vf_Denoise) | |
545 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Delta/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
546 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Delta/CMakeLists.txt 2009-12-17 17:38:25.586603690 +0200 | |
547 | @@ -4,6 +4,11 @@ | |
548 | SET(ADM_vf_Delta_SRCS ADM_vidDelta.cpp) | |
549 | ||
550 | ADD_LIBRARY(ADM_vf_Delta SHARED ${ADM_vf_Delta_SRCS}) | |
551 | +IF (UNIX) | |
552 | + ADD_TARGET_LDFLAGS(ADM_vf_Delta -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
553 | + ADD_TARGET_LDFLAGS(ADM_vf_Delta -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
554 | + ADD_TARGET_LDFLAGS(ADM_vf_Delta -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
555 | +ENDIF (UNIX) | |
556 | ||
557 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Delta) | |
558 | INSTALL_VIDEOFILTER(ADM_vf_Delta) | |
559 | --- avidemux_2.5.1/plugins/ADM_videoFilters/DropOut/CMakeLists.txt~ 2009-12-17 15:59:01.000000000 +0200 | |
560 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/DropOut/CMakeLists.txt 2009-12-17 17:38:49.576195674 +0200 | |
561 | @@ -4,6 +4,11 @@ | |
562 | SET(ADM_vf_dropOut_SRCS ADM_vidDropOut.cpp) | |
563 | ||
564 | ADD_LIBRARY(ADM_vf_dropOut SHARED ${ADM_vf_dropOut_SRCS}) | |
565 | +IF (UNIX) | |
566 | + ADD_TARGET_LDFLAGS(ADM_vf_dropOut -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
567 | + ADD_TARGET_LDFLAGS(ADM_vf_dropOut -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
568 | + ADD_TARGET_LDFLAGS(ADM_vf_dropOut -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
569 | +ENDIF (UNIX) | |
570 | ||
571 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_dropOut) | |
572 | INSTALL_VIDEOFILTER(ADM_vf_dropOut) | |
573 | --- avidemux_2.5.1/cmake/vf_plugin_gtk.cmake~ 2009-12-17 15:59:01.000000000 +0200 | |
574 | +++ avidemux_2.5.1/cmake/vf_plugin_gtk.cmake 2009-12-17 17:41:13.755986519 +0200 | |
45d8140e | 575 | @@ -20,6 +20,14 @@ |
0c9c2362 ER |
576 | TARGET_LINK_LIBRARIES( ${lib} ADM_UIGtk ADM_render_gtk) |
577 | TARGET_LINK_LIBRARIES(${lib} ${GTK_LDFLAGS} ${GTHREAD_LDFLAGS}) | |
578 | ||
579 | + IF (UNIX) | |
45d8140e ER |
580 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) |
581 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
582 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
0c9c2362 ER |
583 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_UIs/ADM_GTK/src) |
584 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_userInterfaces/ADM_render) | |
585 | + ENDIF (UNIX) | |
586 | + | |
587 | IF (GETTEXT_FOUND) | |
588 | TARGET_LINK_LIBRARIES(${lib} ${GETTEXT_LIBRARY_DIR}) | |
589 | ENDIF(GETTEXT_FOUND) | |
45d8140e ER |
590 | --- avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 |
591 | +++ avidemux_2.5.1/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/CMakeLists.txt 2009-12-17 18:04:32.039363834 +0200 | |
592 | @@ -17,6 +17,11 @@ | |
593 | ADD_DEFINITIONS(${GTK_CFLAGS}) | |
594 | ADD_LIBRARY(${GTK_PLUGIN_NAME} SHARED ${ADM_vidEnc_xvid_Gtk_SRCS}) | |
595 | TARGET_LINK_LIBRARIES(${GTK_PLUGIN_NAME} ADM_vidEnc_xvid ADM_coreUI ${GTK_LDFLAGS} ${GTHREAD_LDFLAGS}) | |
596 | + | |
597 | + IF (UNIX) | |
598 | + ADD_TARGET_LDFLAGS(${GTK_PLUGIN_NAME} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
599 | + ADD_TARGET_LDFLAGS(${GTK_PLUGIN_NAME} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
600 | + ENDIF (UNIX) | |
601 | ||
602 | IF (GETTEXT_FOUND) | |
603 | TARGET_LINK_LIBRARIES(${GTK_PLUGIN_NAME} ${GETTEXT_LIBRARY_DIR}) | |
604 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Telecide/CMakeLists.txt~ 2009-12-17 18:06:41.000000000 +0200 | |
605 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Telecide/CMakeLists.txt 2009-12-17 18:06:45.132903518 +0200 | |
606 | @@ -4,6 +4,11 @@ | |
607 | SET(ADM_vf_telecide_SRCS ADM_vidDecTelecide.cpp videoFunctions.cpp) | |
608 | ||
609 | ADD_LIBRARY(ADM_vf_telecide SHARED ${ADM_vf_telecide_SRCS}) | |
610 | +IF (UNIX) | |
611 | + ADD_TARGET_LDFLAGS(ADM_vf_telecide -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
612 | + ADD_TARGET_LDFLAGS(ADM_vf_telecide -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
613 | + ADD_TARGET_LDFLAGS(ADM_vf_telecide -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
614 | +ENDIF (UNIX) | |
615 | ||
616 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_telecide) | |
617 | INSTALL_VIDEOFILTER(ADM_vf_telecide) | |
618 | --- avidemux_2.5.1/cmake/vf_plugin_qt4.cmake~ 2009-12-17 17:48:16.000000000 +0200 | |
619 | +++ avidemux_2.5.1/cmake/vf_plugin_qt4.cmake 2009-12-17 18:09:26.880584294 +0200 | |
620 | @@ -18,6 +18,14 @@ | |
621 | TARGET_LINK_LIBRARIES( ${lib} ADM_UIQT4 ADM_render_qt4) | |
622 | TARGET_LINK_LIBRARIES(${lib} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}) | |
623 | ||
624 | + IF (UNIX) | |
625 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
626 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
627 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
628 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_UIs/ADM_QT4/src) | |
629 | + ADD_TARGET_LDFLAGS(${lib} -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_userInterfaces/ADM_render) | |
630 | + ENDIF (UNIX) | |
631 | + | |
632 | INIT_VIDEOFILTER_PLUGIN(${lib}) | |
633 | INSTALL_VIDEOFILTER(${lib}) | |
634 | ENDIF (QT4_FOUND) | |
635 | --- avidemux_2.5.1/plugins/ADM_videoFilters/MplayerResize/CMakeLists.txt~ 2009-12-17 18:13:53.000000000 +0200 | |
636 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/MplayerResize/CMakeLists.txt 2009-12-17 18:14:02.269098903 +0200 | |
637 | @@ -1,6 +1,16 @@ | |
638 | INCLUDE(vf_plugin) | |
639 | include(admFFmpegUtil) | |
640 | ||
641 | +if (WIN32) | |
642 | + set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
643 | + set(LIBAVUTIL_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
644 | + set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
645 | +else (WIN32) | |
646 | + set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec) | |
647 | + set(LIBAVUTIL_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavutil) | |
648 | + set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libswscale) | |
649 | +endif (WIN32) | |
650 | + | |
651 | SET(resizeCommon_SRCS ADM_vidMPLResize.cpp) | |
652 | SET(resizeCommonGtk_SRCS gtk/gtk_resize.cpp) | |
653 | SET(resizeCommonQT_SRCS qt4/Q_resize.cpp) | |
654 | @@ -12,13 +22,13 @@ | |
655 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
656 | ||
657 | add_library(ADM_libswscale UNKNOWN IMPORTED) | |
658 | -set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBSWSCALE_LIB}") | |
659 | +set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${LIBSWSCALE_INSTALL_DIR}/${LIBSWSCALE_LIB}") | |
660 | ||
661 | add_library(ADM_libavcodec UNKNOWN IMPORTED) | |
662 | -set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}") | |
663 | +set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${LIBAVCODEC_INSTALL_DIR}/${LIBAVCODEC_LIB}") | |
664 | ||
665 | add_library(ADM_libavutil UNKNOWN IMPORTED) | |
666 | -set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBAVUTIL_LIB}") | |
667 | +set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${LIBAVUTIL_INSTALL_DIR}/${LIBAVUTIL_LIB}") | |
668 | ||
669 | INCLUDE(vf_plugin_gtk) | |
670 | INIT_VIDEOFILTER_PLUGIN_GTK(ADM_vf_mplayerResize_gtk ${resizeCommonGtk_SRCS} ${resizeCommon_SRCS}) | |
671 | --- avidemux_2.5.1/plugins/ADM_videoFilters/BlackenBorders/CMakeLists.txt~ 2009-12-17 18:15:32.000000000 +0200 | |
672 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/BlackenBorders/CMakeLists.txt 2009-12-17 18:15:34.575755761 +0200 | |
673 | @@ -4,6 +4,11 @@ | |
674 | SET(ADM_vf_blackenBorders_SRCS ADM_vidBlackenBorders.cpp) | |
675 | ||
676 | ADD_LIBRARY(ADM_vf_blackenBorders SHARED ${ADM_vf_blackenBorders_SRCS}) | |
677 | +IF (UNIX) | |
678 | + ADD_TARGET_LDFLAGS(ADM_vf_blackenBorders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
679 | + ADD_TARGET_LDFLAGS(ADM_vf_blackenBorders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
680 | + ADD_TARGET_LDFLAGS(ADM_vf_blackenBorders -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
681 | +ENDIF (UNIX) | |
682 | ||
683 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_blackenBorders) | |
684 | INSTALL_VIDEOFILTER(ADM_vf_blackenBorders) | |
685 | --- avidemux_2.5.1/plugins/ADM_videoFilters/KernelDeint/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
686 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/KernelDeint/CMakeLists.txt 2009-12-17 18:15:53.225754243 +0200 | |
687 | @@ -4,6 +4,11 @@ | |
688 | SET(ADM_vf_kernelDeint_SRCS ADM_vidKernelDeint.cpp) | |
689 | ||
690 | ADD_LIBRARY(ADM_vf_kernelDeint SHARED ${ADM_vf_kernelDeint_SRCS}) | |
691 | +IF (UNIX) | |
692 | + ADD_TARGET_LDFLAGS(ADM_vf_kernelDeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
693 | + ADD_TARGET_LDFLAGS(ADM_vf_kernelDeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
694 | + ADD_TARGET_LDFLAGS(ADM_vf_kernelDeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
695 | +ENDIF (UNIX) | |
696 | ||
697 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_kernelDeint) | |
698 | INSTALL_VIDEOFILTER(ADM_vf_kernelDeint) | |
699 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Deinterlace/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
700 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Deinterlace/CMakeLists.txt 2009-12-17 18:16:18.419085514 +0200 | |
701 | @@ -4,6 +4,11 @@ | |
702 | SET(ADM_vf_Deinterlace_SRCS ADM_vidDeinterlace.cpp) | |
703 | ||
704 | ADD_LIBRARY(ADM_vf_Deinterlace SHARED ${ADM_vf_Deinterlace_SRCS}) | |
705 | +IF (UNIX) | |
706 | + ADD_TARGET_LDFLAGS(ADM_vf_Deinterlace -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
707 | + ADD_TARGET_LDFLAGS(ADM_vf_Deinterlace -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
708 | + ADD_TARGET_LDFLAGS(ADM_vf_Deinterlace -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
709 | +ENDIF (UNIX) | |
710 | ||
711 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Deinterlace) | |
712 | INSTALL_VIDEOFILTER(ADM_vf_Deinterlace) | |
713 | --- avidemux_2.5.1/plugins/ADM_videoFilters/KeepField/CMakeLists.txt~ 2009-12-17 18:20:52.000000000 +0200 | |
714 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/KeepField/CMakeLists.txt 2009-12-17 18:20:55.059265548 +0200 | |
715 | @@ -3,27 +3,52 @@ | |
716 | ||
717 | SET(ADM_vf_separateFieldSRCS ADM_vidSeparateField.cpp) | |
718 | ADD_LIBRARY(ADM_vf_separateField SHARED ${ADM_vf_separateFieldSRCS}) | |
719 | +IF (UNIX) | |
720 | + ADD_TARGET_LDFLAGS(ADM_vf_separateField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
721 | + ADD_TARGET_LDFLAGS(ADM_vf_separateField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
722 | + ADD_TARGET_LDFLAGS(ADM_vf_separateField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
723 | +ENDIF (UNIX) | |
724 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_separateField) | |
725 | INSTALL_VIDEOFILTER(ADM_vf_separateField) | |
726 | ||
727 | SET(ADM_vf_mergeFieldSRCS ADM_vidMergeField.cpp) | |
728 | ADD_LIBRARY(ADM_vf_mergeField SHARED ${ADM_vf_mergeFieldSRCS}) | |
729 | +IF (UNIX) | |
730 | + ADD_TARGET_LDFLAGS(ADM_vf_mergeField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
731 | + ADD_TARGET_LDFLAGS(ADM_vf_mergeField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
732 | + ADD_TARGET_LDFLAGS(ADM_vf_mergeField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
733 | +ENDIF (UNIX) | |
734 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_mergeField) | |
735 | INSTALL_VIDEOFILTER(ADM_vf_mergeField) | |
736 | ||
737 | SET(ADM_vf_stackFieldSRCS ADM_vidStackField.cpp) | |
738 | ADD_LIBRARY(ADM_vf_stackField SHARED ${ADM_vf_stackFieldSRCS}) | |
739 | +IF (UNIX) | |
740 | + ADD_TARGET_LDFLAGS(ADM_vf_stackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
741 | + ADD_TARGET_LDFLAGS(ADM_vf_stackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
742 | + ADD_TARGET_LDFLAGS(ADM_vf_stackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
743 | +ENDIF (UNIX) | |
744 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_stackField) | |
745 | INSTALL_VIDEOFILTER(ADM_vf_stackField) | |
746 | ||
747 | ||
748 | SET(ADM_vf_hzStackFieldSRCS ADM_vidHzStackField.cpp) | |
749 | ADD_LIBRARY(ADM_vf_hzStackField SHARED ${ADM_vf_hzStackFieldSRCS}) | |
750 | +IF (UNIX) | |
751 | + ADD_TARGET_LDFLAGS(ADM_vf_hzStackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
752 | + ADD_TARGET_LDFLAGS(ADM_vf_hzStackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
753 | + ADD_TARGET_LDFLAGS(ADM_vf_hzStackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
754 | +ENDIF (UNIX) | |
755 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_hzStackField) | |
756 | INSTALL_VIDEOFILTER(ADM_vf_hzStackField) | |
757 | ||
758 | SET(ADM_vf_unstackFieldSRCS ADM_vidUnstackField.cpp) | |
759 | ADD_LIBRARY(ADM_vf_unstackField SHARED ${ADM_vf_unstackFieldSRCS}) | |
760 | +IF (UNIX) | |
761 | + ADD_TARGET_LDFLAGS(ADM_vf_unstackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
762 | + ADD_TARGET_LDFLAGS(ADM_vf_unstackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
763 | + ADD_TARGET_LDFLAGS(ADM_vf_unstackField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
764 | +ENDIF (UNIX) | |
765 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_unstackField) | |
766 | INSTALL_VIDEOFILTER(ADM_vf_unstackField) | |
767 | ||
768 | --- avidemux_2.5.1/plugins/ADM_videoFilters/FluxSmooth/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
769 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/FluxSmooth/CMakeLists.txt 2009-12-17 18:21:35.355720292 +0200 | |
770 | @@ -4,6 +4,11 @@ | |
771 | SET(ADM_vf_FluxSmooth_SRCS ADM_vidFlux.cpp) | |
772 | ||
773 | ADD_LIBRARY(ADM_vf_FluxSmooth SHARED ${ADM_vf_FluxSmooth_SRCS}) | |
774 | +IF (UNIX) | |
775 | + ADD_TARGET_LDFLAGS(ADM_vf_FluxSmooth -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
776 | + ADD_TARGET_LDFLAGS(ADM_vf_FluxSmooth -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
777 | + ADD_TARGET_LDFLAGS(ADM_vf_FluxSmooth -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
778 | +ENDIF (UNIX) | |
779 | ||
780 | IF (APPLE) | |
781 | TARGET_LINK_LIBRARIES(ADM_vf_FluxSmooth -Wl,-read_only_relocs,suppress) | |
782 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Stabilize/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
783 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Stabilize/CMakeLists.txt 2009-12-17 18:22:02.955717229 +0200 | |
784 | @@ -4,6 +4,11 @@ | |
785 | SET(ADM_vf_Stabilize_SRCS ADM_vidStabilize.cpp) | |
786 | ||
787 | ADD_LIBRARY(ADM_vf_Stabilize SHARED ${ADM_vf_Stabilize_SRCS}) | |
788 | +IF (UNIX) | |
789 | + ADD_TARGET_LDFLAGS(ADM_vf_Stabilize -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
790 | + ADD_TARGET_LDFLAGS(ADM_vf_Stabilize -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
791 | + ADD_TARGET_LDFLAGS(ADM_vf_Stabilize -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
792 | +ENDIF (UNIX) | |
793 | ||
794 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Stabilize) | |
795 | INSTALL_VIDEOFILTER(ADM_vf_Stabilize) | |
796 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Mosaic/CMakeLists.txt~ 2009-12-17 18:25:10.000000000 +0200 | |
797 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Mosaic/CMakeLists.txt 2009-12-17 18:25:13.082781359 +0200 | |
798 | @@ -1,6 +1,16 @@ | |
799 | INCLUDE(vf_plugin) | |
800 | include(admFFmpegUtil) | |
801 | ||
802 | +if (WIN32) | |
803 | + set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
804 | + set(LIBAVUTIL_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
805 | + set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
806 | +else (WIN32) | |
807 | + set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec) | |
808 | + set(LIBAVUTIL_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavutil) | |
809 | + set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libswscale) | |
810 | +endif (WIN32) | |
811 | + | |
812 | SET(ADM_vf_Mosaic_SRCS ADM_vidMosaic.cpp) | |
813 | ||
814 | getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
815 | @@ -8,16 +18,22 @@ | |
816 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
817 | ||
818 | add_library(ADM_libswscale UNKNOWN IMPORTED) | |
819 | -set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBSWSCALE_LIB}") | |
820 | +set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${LIBSWSCALE_INSTALL_DIR}/${LIBSWSCALE_LIB}") | |
821 | ||
822 | add_library(ADM_libavcodec UNKNOWN IMPORTED) | |
823 | -set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}") | |
824 | +set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${LIBAVCODEC_INSTALL_DIR}/${LIBAVCODEC_LIB}") | |
825 | ||
826 | add_library(ADM_libavutil UNKNOWN IMPORTED) | |
827 | -set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBAVUTIL_LIB}") | |
828 | +set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${LIBAVUTIL_INSTALL_DIR}/${LIBAVUTIL_LIB}") | |
829 | ||
830 | ADD_LIBRARY(ADM_vf_Mosaic SHARED ${ADM_vf_Mosaic_SRCS}) | |
831 | TARGET_LINK_LIBRARIES(ADM_vf_Mosaic ADM_libswscale ADM_libavcodec ADM_libavutil) | |
832 | ||
833 | +IF (UNIX) | |
834 | + ADD_TARGET_LDFLAGS(ADM_vf_Mosaic -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
835 | + ADD_TARGET_LDFLAGS(ADM_vf_Mosaic -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
836 | + ADD_TARGET_LDFLAGS(ADM_vf_Mosaic -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
837 | +ENDIF (UNIX) | |
838 | + | |
839 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Mosaic) | |
840 | INSTALL_VIDEOFILTER(ADM_vf_Mosaic) | |
841 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Whirl/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
842 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Whirl/CMakeLists.txt 2009-12-17 18:25:36.139445701 +0200 | |
843 | @@ -4,6 +4,11 @@ | |
844 | SET(ADM_vf_Whirl_SRCS ADM_vidWhirl.cpp) | |
845 | ||
846 | ADD_LIBRARY(ADM_vf_Whirl SHARED ${ADM_vf_Whirl_SRCS}) | |
847 | +IF (UNIX) | |
848 | + ADD_TARGET_LDFLAGS(ADM_vf_Whirl -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
849 | + ADD_TARGET_LDFLAGS(ADM_vf_Whirl -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
850 | + ADD_TARGET_LDFLAGS(ADM_vf_Whirl -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
851 | +ENDIF (UNIX) | |
852 | ||
853 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Whirl) | |
854 | INSTALL_VIDEOFILTER(ADM_vf_Whirl) | |
855 | --- avidemux_2.5.1/plugins/ADM_videoFilters/PalShift/CMakeLists.txt~ 2009-12-17 18:27:14.000000000 +0200 | |
856 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/PalShift/CMakeLists.txt 2009-12-17 18:27:15.889019040 +0200 | |
857 | @@ -3,12 +3,22 @@ | |
858 | ||
859 | SET(ADM_vf_palShift_SRCS ADM_vidPalShift.cpp) | |
860 | ADD_LIBRARY(ADM_vf_palShift SHARED ${ADM_vf_palShift_SRCS}) | |
861 | +IF (UNIX) | |
862 | + ADD_TARGET_LDFLAGS(ADM_vf_palShift -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
863 | + ADD_TARGET_LDFLAGS(ADM_vf_palShift -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
864 | + ADD_TARGET_LDFLAGS(ADM_vf_palShift -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
865 | +ENDIF (UNIX) | |
866 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_palShift) | |
867 | INSTALL_VIDEOFILTER(ADM_vf_palShift) | |
868 | ||
869 | ||
870 | SET(ADM_vf_smartPalShift_SRCS ADM_vidPalSmart.cpp) | |
871 | ADD_LIBRARY(ADM_vf_smartPalShift SHARED ${ADM_vf_smartPalShift_SRCS}) | |
872 | +IF (UNIX) | |
873 | + ADD_TARGET_LDFLAGS(ADM_vf_smartPalShift -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
874 | + ADD_TARGET_LDFLAGS(ADM_vf_smartPalShift -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
875 | + ADD_TARGET_LDFLAGS(ADM_vf_smartPalShift -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
876 | +ENDIF (UNIX) | |
877 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_smartPalShift) | |
878 | INSTALL_VIDEOFILTER(ADM_vf_smartPalShift) | |
879 | ||
880 | --- avidemux_2.5.1/plugins/ADM_videoFilters/SwapField/CMakeLists.txt~ 2009-12-17 18:29:24.000000000 +0200 | |
881 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/SwapField/CMakeLists.txt 2009-12-17 18:29:27.222755929 +0200 | |
882 | @@ -3,23 +3,43 @@ | |
883 | ||
884 | SET(ADM_vf_swapField_SRCS ADM_vidSwapFields.cpp) | |
885 | ADD_LIBRARY(ADM_vf_swapField SHARED ${ADM_vf_swapField_SRCS}) | |
886 | +IF (UNIX) | |
887 | + ADD_TARGET_LDFLAGS(ADM_vf_swapField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
888 | + ADD_TARGET_LDFLAGS(ADM_vf_swapField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
889 | + ADD_TARGET_LDFLAGS(ADM_vf_swapField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
890 | +ENDIF (UNIX) | |
891 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_swapField) | |
892 | INSTALL_VIDEOFILTER(ADM_vf_swapField) | |
893 | ||
894 | ||
895 | SET(ADM_vf_smartSwapField_SRCS ADM_vidSwapSmart.cpp) | |
896 | ADD_LIBRARY(ADM_vf_smartSwapField SHARED ${ADM_vf_smartSwapField_SRCS}) | |
897 | +IF (UNIX) | |
898 | + ADD_TARGET_LDFLAGS(ADM_vf_smartSwapField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
899 | + ADD_TARGET_LDFLAGS(ADM_vf_smartSwapField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
900 | + ADD_TARGET_LDFLAGS(ADM_vf_smartSwapField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
901 | +ENDIF (UNIX) | |
902 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_smartSwapField) | |
903 | INSTALL_VIDEOFILTER(ADM_vf_smartSwapField) | |
904 | ||
905 | ||
906 | SET(ADM_vf_keepOddField_SRCS ADM_vidKeepOddFields.cpp) | |
907 | ADD_LIBRARY(ADM_vf_keepOddField SHARED ${ADM_vf_keepOddField_SRCS}) | |
908 | +IF (UNIX) | |
909 | + ADD_TARGET_LDFLAGS(ADM_vf_keepOddField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
910 | + ADD_TARGET_LDFLAGS(ADM_vf_keepOddField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
911 | + ADD_TARGET_LDFLAGS(ADM_vf_keepOddField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
912 | +ENDIF (UNIX) | |
913 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_keepOddField) | |
914 | INSTALL_VIDEOFILTER(ADM_vf_keepOddField) | |
915 | ||
916 | SET(ADM_vf_keepEvenField_SRCS ADM_vidKeepEvenFields.cpp) | |
917 | ADD_LIBRARY(ADM_vf_keepEvenField SHARED ${ADM_vf_keepEvenField_SRCS}) | |
918 | +IF (UNIX) | |
919 | + ADD_TARGET_LDFLAGS(ADM_vf_keepEvenField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
920 | + ADD_TARGET_LDFLAGS(ADM_vf_keepEvenField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
921 | + ADD_TARGET_LDFLAGS(ADM_vf_keepEvenField -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
922 | +ENDIF (UNIX) | |
923 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_keepEvenField) | |
924 | INSTALL_VIDEOFILTER(ADM_vf_keepEvenField) | |
925 | ||
926 | --- avidemux_2.5.1/plugins/ADM_videoFilters/MSharpen/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
927 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/MSharpen/CMakeLists.txt 2009-12-17 18:29:56.839286455 +0200 | |
928 | @@ -4,6 +4,11 @@ | |
929 | SET(ADM_vf_mSharpen_SRCS ADM_vidMSharpen.cpp) | |
930 | ||
931 | ADD_LIBRARY(ADM_vf_mSharpen SHARED ${ADM_vf_mSharpen_SRCS}) | |
932 | +IF (UNIX) | |
933 | + ADD_TARGET_LDFLAGS(ADM_vf_mSharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
934 | + ADD_TARGET_LDFLAGS(ADM_vf_mSharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
935 | + ADD_TARGET_LDFLAGS(ADM_vf_mSharpen -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
936 | +ENDIF (UNIX) | |
937 | ||
938 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_mSharpen) | |
939 | INSTALL_VIDEOFILTER(ADM_vf_mSharpen) | |
940 | --- avidemux_2.5.1/plugins/ADM_videoFilters/MSmooth/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
941 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/MSmooth/CMakeLists.txt 2009-12-17 18:30:25.092333293 +0200 | |
942 | @@ -4,6 +4,11 @@ | |
943 | SET(ADM_vf_mSmooth_SRCS ADM_vidMsmooth.cpp) | |
944 | ||
945 | ADD_LIBRARY(ADM_vf_mSmooth SHARED ${ADM_vf_mSmooth_SRCS}) | |
946 | +IF (UNIX) | |
947 | + ADD_TARGET_LDFLAGS(ADM_vf_mSmooth -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
948 | + ADD_TARGET_LDFLAGS(ADM_vf_mSmooth -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
949 | + ADD_TARGET_LDFLAGS(ADM_vf_mSmooth -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
950 | +ENDIF (UNIX) | |
951 | ||
952 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_mSmooth) | |
953 | INSTALL_VIDEOFILTER(ADM_vf_mSmooth) | |
954 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Soften/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
955 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Soften/CMakeLists.txt 2009-12-17 18:30:47.122747898 +0200 | |
956 | @@ -4,6 +4,11 @@ | |
957 | SET(ADM_vf_soften_SRCS ADM_vidSoften.cpp) | |
958 | ||
959 | ADD_LIBRARY(ADM_vf_soften SHARED ${ADM_vf_soften_SRCS}) | |
960 | +IF (UNIX) | |
961 | + ADD_TARGET_LDFLAGS(ADM_vf_soften -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
962 | + ADD_TARGET_LDFLAGS(ADM_vf_soften -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
963 | + ADD_TARGET_LDFLAGS(ADM_vf_soften -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
964 | +ENDIF (UNIX) | |
965 | ||
966 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_soften) | |
967 | INSTALL_VIDEOFILTER(ADM_vf_soften) | |
968 | --- avidemux_2.5.1/plugins/ADM_videoFilters/lavDeinterlace/CMakeLists.txt~ 2009-12-17 18:33:13.000000000 +0200 | |
969 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/lavDeinterlace/CMakeLists.txt 2009-12-17 18:33:16.192316325 +0200 | |
970 | @@ -1,6 +1,14 @@ | |
971 | INCLUDE(vf_plugin) | |
972 | include(admFFmpegUtil) | |
973 | ||
974 | +if (WIN32) | |
975 | + set(LIBPOSTPROC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
976 | + set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
977 | +else (WIN32) | |
978 | + set(LIBPOSTPROC_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libpostproc) | |
979 | + set(LIBSWSCALE_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libswscale) | |
980 | +endif (WIN32) | |
981 | + | |
982 | SET(ADM_vf_lavDeinterlace_SRCS ADM_lavpp_deint.cpp) | |
983 | ||
984 | getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
985 | @@ -8,13 +16,18 @@ | |
986 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
987 | ||
988 | add_library(ADM_libswscale UNKNOWN IMPORTED) | |
989 | -set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBSWSCALE_LIB}") | |
990 | +set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${LIBSWSCALE_INSTALL_DIR}/${LIBSWSCALE_LIB}") | |
991 | ||
992 | add_library(ADM_libpostproc UNKNOWN IMPORTED) | |
993 | -set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBPOSTPROC_LIB}") | |
994 | +set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${LIBPOSTPROC_INSTALL_DIR}/${LIBPOSTPROC_LIB}") | |
995 | ||
996 | ADD_LIBRARY(ADM_vf_lavDeinterlace SHARED ${ADM_vf_lavDeinterlace_SRCS}) | |
997 | TARGET_LINK_LIBRARIES(ADM_vf_lavDeinterlace ADM_libswscale ADM_libpostproc) | |
998 | +IF (UNIX) | |
999 | + ADD_TARGET_LDFLAGS(ADM_vf_lavDeinterlace -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1000 | + ADD_TARGET_LDFLAGS(ADM_vf_lavDeinterlace -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1001 | + ADD_TARGET_LDFLAGS(ADM_vf_lavDeinterlace -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
1002 | +ENDIF (UNIX) | |
1003 | ||
1004 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_lavDeinterlace) | |
1005 | INSTALL_VIDEOFILTER(ADM_vf_lavDeinterlace) | |
1006 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Rotate/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
1007 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Rotate/CMakeLists.txt 2009-12-17 18:35:00.028973213 +0200 | |
1008 | @@ -4,6 +4,11 @@ | |
1009 | SET(ADM_vf_rotate_SRCS ADM_vidRotate.cpp) | |
1010 | ||
1011 | ADD_LIBRARY(ADM_vf_rotate SHARED ${ADM_vf_rotate_SRCS}) | |
1012 | +IF (UNIX) | |
1013 | + ADD_TARGET_LDFLAGS(ADM_vf_rotate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1014 | + ADD_TARGET_LDFLAGS(ADM_vf_rotate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1015 | + ADD_TARGET_LDFLAGS(ADM_vf_rotate -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
1016 | +ENDIF (UNIX) | |
1017 | ||
1018 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_rotate) | |
1019 | INSTALL_VIDEOFILTER(ADM_vf_rotate) | |
1020 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Tdeint/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
1021 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Tdeint/CMakeLists.txt 2009-12-17 18:35:32.682350488 +0200 | |
1022 | @@ -4,6 +4,11 @@ | |
1023 | SET(ADM_vf_tdeint_SRCS ADM_vidTdeint.cpp DIA_tdeint.cpp ) | |
1024 | ||
1025 | ADD_LIBRARY(ADM_vf_tdeint SHARED ${ADM_vf_tdeint_SRCS}) | |
1026 | +IF (UNIX) | |
1027 | + ADD_TARGET_LDFLAGS(ADM_vf_tdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1028 | + ADD_TARGET_LDFLAGS(ADM_vf_tdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1029 | + ADD_TARGET_LDFLAGS(ADM_vf_tdeint -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
1030 | +ENDIF (UNIX) | |
1031 | ||
1032 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_tdeint) | |
1033 | INSTALL_VIDEOFILTER(ADM_vf_tdeint) | |
1034 | --- avidemux_2.5.1/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt~ 2009-12-17 18:43:48.000000000 +0200 | |
1035 | +++ avidemux_2.5.1/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2009-12-17 18:43:50.376002948 +0200 | |
1036 | @@ -1,6 +1,12 @@ | |
1037 | INCLUDE(ae_plugin) | |
1038 | include(admFFmpegUtil) | |
1039 | ||
1040 | + if (WIN32) | |
1041 | + set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}) | |
1042 | + else (WIN32) | |
1043 | + set(LIBAVCODEC_INSTALL_DIR ${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_libraries/ffmpeg/libavcodec) | |
1044 | + endif (WIN32) | |
1045 | + | |
1046 | getFfmpegLibNames("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
1047 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux") | |
1048 | INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_libraries/ffmpeg") | |
1049 | @@ -8,11 +14,16 @@ | |
1050 | SET(ADM_ae_lav_mp2_SRCS audioencoder_lavcodec.cpp) | |
1051 | ||
1052 | add_library(ADM_libavcodec UNKNOWN IMPORTED) | |
1053 | - set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_LIB_DIR}/${LIBAVCODEC_LIB}") | |
1054 | + set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${LIBAVCODEC_INSTALL_DIR}/${LIBAVCODEC_LIB}") | |
1055 | ||
1056 | ADD_LIBRARY(ADM_ae_lav_mp2 SHARED ${ADM_ae_lav_mp2_SRCS}) | |
1057 | ADD_TARGET_CFLAGS(ADM_ae_lav_mp2 "-DADM_LAV_MP2") | |
1058 | TARGET_LINK_LIBRARIES(ADM_ae_lav_mp2 ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec) | |
1059 | + IF (UNIX) | |
1060 | + ADD_TARGET_LDFLAGS(ADM_ae_lav_mp2 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1061 | + ADD_TARGET_LDFLAGS(ADM_ae_lav_mp2 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1062 | + ADD_TARGET_LDFLAGS(ADM_ae_lav_mp2 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
1063 | + ENDIF (UNIX) | |
1064 | ||
1065 | INIT_AUDIO_ENCODER(ADM_ae_lav_mp2) | |
1066 | INSTALL_AUDIOENCODER(ADM_ae_lav_mp2) | |
1067 | @@ -22,6 +33,11 @@ | |
1068 | ADD_LIBRARY(ADM_ae_lav_ac3 SHARED ${ADM_ae_lav_ac3_SRCS}) | |
1069 | ADD_TARGET_CFLAGS(ADM_ae_lav_ac3 "-DADM_LAV_AC3") | |
1070 | TARGET_LINK_LIBRARIES(ADM_ae_lav_ac3 ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec) | |
1071 | + IF (UNIX) | |
1072 | + ADD_TARGET_LDFLAGS(ADM_ae_lav_ac3 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1073 | + ADD_TARGET_LDFLAGS(ADM_ae_lav_ac3 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1074 | + ADD_TARGET_LDFLAGS(ADM_ae_lav_ac3 -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
1075 | + ENDIF (UNIX) | |
1076 | ||
1077 | INIT_AUDIO_ENCODER(ADM_ae_lav_ac3) | |
1078 | INSTALL_AUDIOENCODER(ADM_ae_lav_ac3) | |
1079 | --- avidemux_2.5.1/plugins/ADM_audioEncoders/lame/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
1080 | +++ avidemux_2.5.1/plugins/ADM_audioEncoders/lame/CMakeLists.txt 2009-12-17 18:44:42.138914394 +0200 | |
1081 | @@ -5,6 +5,11 @@ | |
1082 | ADD_LIBRARY(ADM_ae_lame SHARED ${ADM_ae_lame_SRCS}) | |
1083 | ||
1084 | TARGET_LINK_LIBRARIES(ADM_ae_lame ${LAME_LIBRARY_DIR} ADM_core ADM_coreAudio ADM_coreUI) | |
1085 | + IF (UNIX) | |
1086 | + ADD_TARGET_LDFLAGS(ADM_ae_lame -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1087 | + ADD_TARGET_LDFLAGS(ADM_ae_lame -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1088 | + ADD_TARGET_LDFLAGS(ADM_ae_lame -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
1089 | + ENDIF (UNIX) | |
1090 | ||
1091 | ADD_TARGET_CFLAGS(ADM_ae_lame "-I${LAME_INCLUDE_DIR}") | |
1092 | ||
1093 | --- avidemux_2.5.1/plugins/ADM_audioEncoders/vorbis/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
1094 | +++ avidemux_2.5.1/plugins/ADM_audioEncoders/vorbis/CMakeLists.txt 2009-12-17 18:52:10.085537011 +0200 | |
1095 | @@ -5,6 +5,11 @@ | |
1096 | ADD_LIBRARY(ADM_ae_vorbis SHARED ${ADM_ae_vorbis_SRCS}) | |
1097 | ||
1098 | TARGET_LINK_LIBRARIES(ADM_ae_vorbis ${VORBIS_LIBRARY_DIR} ${VORBISENC_LIBRARY_DIR} ADM_core ADM_coreAudio ADM_coreUI) | |
1099 | + IF (UNIX) | |
1100 | + ADD_TARGET_LDFLAGS(ADM_ae_vorbis -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1101 | + ADD_TARGET_LDFLAGS(ADM_ae_vorbis -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1102 | + ADD_TARGET_LDFLAGS(ADM_ae_vorbis -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
1103 | + ENDIF (UNIX) | |
1104 | ||
1105 | ADD_TARGET_CFLAGS(ADM_ae_vorbis "-I${VORBIS_INCLUDE_DIR}") | |
1106 | ||
1107 | --- avidemux_2.5.1/plugins/ADM_audioEncoders/faac/CMakeLists.txt~ 2009-12-17 17:48:16.000000000 +0200 | |
1108 | +++ avidemux_2.5.1/plugins/ADM_audioEncoders/faac/CMakeLists.txt 2009-12-17 18:52:49.859490623 +0200 | |
1109 | @@ -5,6 +5,11 @@ | |
1110 | ADD_LIBRARY(ADM_ae_faac SHARED ${ADM_ae_faac_SRCS}) | |
1111 | ||
1112 | TARGET_LINK_LIBRARIES(ADM_ae_faac ${FAAC_LIBRARY_DIR} ADM_core ADM_coreAudio ADM_coreUI) | |
1113 | + IF (UNIX) | |
1114 | + ADD_TARGET_LDFLAGS(ADM_ae_faac -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1115 | + ADD_TARGET_LDFLAGS(ADM_ae_faac -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1116 | + ADD_TARGET_LDFLAGS(ADM_ae_faac -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
1117 | + ENDIF (UNIX) | |
1118 | ||
1119 | ADD_TARGET_CFLAGS(ADM_ae_faac "-I${FAAC_INCLUDE_DIR}") | |
1120 | ||
c832d364 ER |
1121 | --- avidemux_2.5.1/plugins/ADM_videoFilters/Ass/CMakeLists.txt~ 2009-12-17 19:07:00.000000000 +0200 |
1122 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/Ass/CMakeLists.txt 2009-12-17 19:07:02.589061336 +0200 | |
1123 | @@ -10,6 +10,11 @@ | |
1124 | ADD_LIBRARY(ADM_vf_ssa SHARED ${ADM_vf_ssa_SRCS}) | |
1125 | TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass) | |
1126 | ADD_TARGET_LDFLAGS(ADM_vf_ssa "${FREETYPE2_LDFLAGS}") | |
1127 | + IF (UNIX) | |
1128 | + ADD_TARGET_LDFLAGS(ADM_vf_ssa -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1129 | + ADD_TARGET_LDFLAGS(ADM_vf_ssa -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1130 | + ADD_TARGET_LDFLAGS(ADM_vf_ssa -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
1131 | + ENDIF (UNIX) | |
1132 | ||
1133 | IF (FONTCONFIG_FOUND) | |
1134 | ADD_TARGET_LDFLAGS(ADM_vf_ssa "${FONTCONFIG_LDFLAGS}") | |
1135 | --- avidemux_2.5.1/plugins/ADM_videoFilters/TIsophote/CMakeLists.txt~ 2009-12-17 18:59:00.000000000 +0200 | |
1136 | +++ avidemux_2.5.1/plugins/ADM_videoFilters/TIsophote/CMakeLists.txt 2009-12-17 19:07:47.502137255 +0200 | |
1137 | @@ -4,6 +4,11 @@ | |
1138 | SET(ADM_vf_Tisophote_SRCS ADM_vidTisophote.cpp) | |
1139 | ||
1140 | ADD_LIBRARY(ADM_vf_Tisophote SHARED ${ADM_vf_Tisophote_SRCS}) | |
1141 | +IF (UNIX) | |
1142 | + ADD_TARGET_LDFLAGS(ADM_vf_Tisophote -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1143 | + ADD_TARGET_LDFLAGS(ADM_vf_Tisophote -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1144 | + ADD_TARGET_LDFLAGS(ADM_vf_Tisophote -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreImage/src) | |
1145 | +ENDIF (UNIX) | |
1146 | ||
1147 | INIT_VIDEOFILTER_PLUGIN(ADM_vf_Tisophote) | |
1148 | INSTALL_VIDEOFILTER(ADM_vf_Tisophote) | |
1149 | --- avidemux_2.5.1/plugins/ADM_audioEncoders/twolame/CMakeLists.txt~ 2009-12-17 19:10:06.000000000 +0200 | |
1150 | +++ avidemux_2.5.1/plugins/ADM_audioEncoders/twolame/CMakeLists.txt 2009-12-17 19:10:08.465845321 +0200 | |
1151 | @@ -8,6 +8,11 @@ | |
1152 | TARGET_LINK_LIBRARIES(ADM_ae_twolame ADM_libtwolame ADM_core ADM_coreAudio ADM_coreUI) | |
1153 | include_directories(ADM_libtwolame) | |
1154 | ||
1155 | + IF (UNIX) | |
1156 | + ADD_TARGET_LDFLAGS(ADM_ae_twolame -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1157 | + ADD_TARGET_LDFLAGS(ADM_ae_twolame -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1158 | + ADD_TARGET_LDFLAGS(ADM_ae_twolame -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
1159 | + ENDIF (UNIX) | |
1160 | ||
1161 | INIT_AUDIO_ENCODER(ADM_ae_twolame) | |
1162 | INSTALL_AUDIOENCODER(ADM_ae_twolame) | |
1163 | --- avidemux_2.5.1/plugins/ADM_audioEncoders/pcm/CMakeLists.txt~ 2009-12-17 18:59:00.000000000 +0200 | |
1164 | +++ avidemux_2.5.1/plugins/ADM_audioEncoders/pcm/CMakeLists.txt 2009-12-17 19:10:29.465843181 +0200 | |
1165 | @@ -4,6 +4,11 @@ | |
1166 | ||
1167 | ADD_LIBRARY(ADM_ae_pcm SHARED ${ADM_ae_pcm_SRCS}) | |
1168 | TARGET_LINK_LIBRARIES(ADM_ae_pcm ADM_core ADM_coreAudio) | |
1169 | + IF (UNIX) | |
1170 | + ADD_TARGET_LDFLAGS(ADM_ae_pcm -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_core/src) | |
1171 | + ADD_TARGET_LDFLAGS(ADM_ae_pcm -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreUI/src) | |
1172 | + ADD_TARGET_LDFLAGS(ADM_ae_pcm -L${AVIDEMUX_SOURCE_DIR}/build/avidemux/ADM_coreAudio/src) | |
1173 | + ENDIF (UNIX) | |
1174 | ||
1175 | INIT_AUDIO_ENCODER(ADM_ae_pcm) | |
1176 | INSTALL_AUDIOENCODER(ADM_ae_pcm) |