projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ffmpeg (2.8.4->3.0) giflib,openjpeg,x264,x265
[goodguy/history.git]
/
cinelerra-5.0
/
thirdparty
/
Makefile
diff --git
a/cinelerra-5.0/thirdparty/Makefile
b/cinelerra-5.0/thirdparty/Makefile
index 6e3a23234b6aaa3d9503403e3ce6db1a5b60d47e..60c05f731b86f71f1ca70621bea05c85efced2f4 100644
(file)
--- a/
cinelerra-5.0/thirdparty/Makefile
+++ b/
cinelerra-5.0/thirdparty/Makefile
@@
-118,7
+118,7
@@
ffmpeg.cfg_params= \
$(call inc_path,faac,include) \
$(call inc_path,twolame,libtwolame) \
$(call inc_path,lame,include) \
$(call inc_path,faac,include) \
$(call inc_path,twolame,libtwolame) \
$(call inc_path,lame,include) \
- $(call inc_path,openjpeg,src/lib/open
mj
2) \
+ $(call inc_path,openjpeg,src/lib/open
jp
2) \
$(call inc_path,libvorbis,include) \
$(call inc_path,libtheora,include) \
$(call inc_path,libvpx) \
$(call inc_path,libvorbis,include) \
$(call inc_path,libtheora,include) \
$(call inc_path,libvpx) \
@@
-178,8
+178,8
@@
libtheora.ldflags="$(ld_path libvorbis,lib/.libs) $(ld_path libogg,src/.libs)"
libtheora.cfg_params= --disable-examples --enable-shared=no
libuuid.cfg_params=--enable-shared=no
libvorbis.cfg_params= --disable-oggtest --enable-shared=no
libtheora.cfg_params= --disable-examples --enable-shared=no
libuuid.cfg_params=--enable-shared=no
libvorbis.cfg_params= --disable-oggtest --enable-shared=no
-openjpeg.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF
-DBUILD_MJ2:BOOL=ON
." > ./configure; chmod +x ./configure;
-openjpeg.mak_params=
openmj2
+openjpeg.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
+openjpeg.mak_params=
; cd $(call bld_path,openjpeg,src/lib/openjp2); ln -sf . openjpeg-2.1
opencv.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
openexr.cfg_vars=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
openexr.cfg_params=--enable-shared=no
opencv.cfg_vars=echo "exec cmake -DBUILD_SHARED_LIBS:BOOL=OFF ." > ./configure; chmod +x ./configure;
openexr.cfg_vars=LD_LIBRARY_PATH=$(call bld_path,ilmbase,usr/lib)
openexr.cfg_params=--enable-shared=no