Changeset 223:a32da50c39a7


Ignore:
Timestamp:
10/12/2012 05:35:55 PM (8 years ago)
Author:
Dmitry Fedorov <fedorov@…>
Branch:
default
Phase:
public
Message:

building fixes

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • libsrc/ffmpeg/build-ffmpeg-linux.sh

    r186 r223  
    33chmod a+x ./ffmpeg/configure
    44chmod a+x ./ffmpeg/version.sh
    5 chmod a+x ./ffmpeg/doc/texi2pod.pl
    65
    76rm -Rf ./ffmpeg-obj
     
    1312        --enable-static --disable-shared \
    1413        --prefix=$PWD/../ffmpeg-out \
    15         --enable-gpl --enable-swscale \
    16         --disable-ffserver --disable-ffplay --disable-network --disable-ffmpeg --disable-devices
     14    --enable-gpl --enable-runtime-cpudetect --enable-pthreads --enable-swscale \
     15    --disable-ffserver --disable-ffplay --disable-network --disable-ffmpeg --disable-devices \
     16    --disable-frei0r --disable-libass --disable-libcelt --disable-libopencore-amrnb --disable-libopencore-amrwb \
     17    --disable-libfreetype --disable-libgsm --disable-libmp3lame --disable-libnut --disable-librtmp \
     18    --disable-libspeex --disable-libvorbis \
     19    --enable-bzlib --enable-zlib \
     20    --disable-libopenjpeg --disable-libschroedinger \
     21    --enable-libtheora --enable-libvpx --enable-libx264 --enable-libxvid \
     22    --disable-libvo-aacenc --disable-libvo-amrwbenc \
     23    --disable-libxavs \
     24    --disable-vda       
    1725
    18 make all install
     26
     27make -j 4 all install
    1928
    2029cd ..
  • libsrc/ffmpeg/build-ffmpeg-macosx.sh

    r186 r223  
    33chmod a+x ./ffmpeg/configure
    44chmod a+x ./ffmpeg/version.sh
    5 chmod a+x ./ffmpeg/doc/texi2pod.pl
    65
    76rm -Rf ./ffmpeg-obj
     
    1716cd ffmpeg-obj
    1817../ffmpeg/configure \
    19   --enable-static --disable-shared \
     18  --enable-static --disable-shared --as=yasm \
    2019  --prefix=$PWD/../ffmpeg-out \
    21   --enable-gpl --enable-swscale \
    22   --disable-ffserver --disable-ffplay --disable-network --disable-ffmpeg --disable-devices
     20  --enable-gpl --enable-runtime-cpudetect --enable-pthreads --enable-swscale \
     21  --disable-ffserver --disable-ffplay --disable-network --disable-ffmpeg --disable-devices \
     22  --disable-frei0r --disable-libass --disable-libcelt --disable-libopencore-amrnb --disable-libopencore-amrwb \
     23  --disable-libfreetype --disable-libgsm --disable-libmp3lame --disable-libnut --disable-librtmp \
     24  --disable-libspeex --disable-libvorbis \
     25  --enable-bzlib --enable-zlib \
     26  --disable-libopenjpeg --disable-libschroedinger \
     27  --enable-libtheora --enable-libvpx --enable-libx264 --enable-libxvid \
     28  --disable-libvo-aacenc --disable-libvo-amrwbenc \
     29  --disable-libxavs \
     30  --disable-vda
     31 
     32 
    2333
    24 make all install
     34make -j 16 all install
    2535
    2636cd ..
     
    4454cp ./ffmpeg-out/lib/libavutil.a ../../libs/macosx/libavutil.a
    4555cp ./ffmpeg-out/lib/libswscale.a ../../libs/macosx/libswscale.a
    46 
  • libsrc/libbioimg/formats/tiff/bim_tiny_tiff.h

    r221 r223  
    2121
    2222#include <vector>
    23 
     23#include <string>
    2424
    2525namespace bim {
  • src/imgcnv.pro

    r221 r223  
    3030TEMPLATE = app
    3131#TEMPLATE = lib
    32 VERSION = 0.1.52
     32VERSION = 0.1.53
    3333
    3434CONFIG = console
     
    7171debug: {
    7272   message(Building in DEBUG mode!)
    73    DEFINES += DEBUG _DEBUG _DEBUG_
     73   DEFINES += _DEBUG _DEBUG_
    7474}
    7575
     
    324324    LIBS += $$DN_LIBS_PLTFM/libavcodec.a
    325325    LIBS += $$DN_LIBS_PLTFM/libswscale.a
    326     LIBS += $$DN_LIBS_PLTFM/libavutil.a 
    327   }
     326    LIBS += $$DN_LIBS_PLTFM/libavutil.a     
     327  }
     328  macx {
     329    LIBS += $$DN_LIBS_PLTFM/libx264.a
     330    LIBS += $$DN_LIBS_PLTFM/libvpx.a
     331    LIBS += $$DN_LIBS_PLTFM/libxvidcore.a
     332    LIBS += $$DN_LIBS_PLTFM/libogg.a
     333    LIBS += $$DN_LIBS_PLTFM/libtheora.a
     334    LIBS += $$DN_LIBS_PLTFM/libtheoraenc.a 
     335    LIBS += $$DN_LIBS_PLTFM/libtheoradec.a
     336    LIBS += -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore       
     337  }
     338 
    328339} # FFMPEG           
    329340
     
    503514          $$DN_LIB_EXIV2/exiv2/mrwimage.cpp $$DN_LIB_EXIV2/exiv2/nikonmn.cpp $$DN_LIB_EXIV2/exiv2/olympusmn.cpp \
    504515          $$DN_LIB_EXIV2/exiv2/orfimage.cpp $$DN_LIB_EXIV2/exiv2/panasonicmn.cpp $$DN_LIB_EXIV2/exiv2/pgfimage.cpp \
    505     $$DN_LIB_EXIV2/exiv2/pngimage.cpp $$DN_LIB_EXIV2/exiv2/pngchunk.cpp $$DN_LIB_EXIV2/exiv2/preview.cpp \
     516      $$DN_LIB_EXIV2/exiv2/pngimage.cpp $$DN_LIB_EXIV2/exiv2/pngchunk.cpp $$DN_LIB_EXIV2/exiv2/preview.cpp \
    506517          $$DN_LIB_EXIV2/exiv2/properties.cpp $$DN_LIB_EXIV2/exiv2/psdimage.cpp $$DN_LIB_EXIV2/exiv2/rafimage.cpp \
    507518          $$DN_LIB_EXIV2/exiv2/rw2image.cpp $$DN_LIB_EXIV2/exiv2/sigmamn.cpp $$DN_LIB_EXIV2/exiv2/pentaxmn.cpp \
Note: See TracChangeset for help on using the changeset viewer.