Ticket #2828: t2828_v1.patch

File t2828_v1.patch, 4.0 KB (added by Sergey Kushnirenko, 8 years ago)

  • build/premake/extern_libs4.lua

     
    422422            })
    423423        end,
    424424    },
    425     libjpg = {
    426         compile_settings = function()
    427             if os.is("windows") or os.is("macosx") then
    428                 add_default_include_paths("libjpg")
    429             end
    430         end,
    431         link_settings = function()
    432             if os.is("windows") or os.is("macosx") then
    433                 add_default_lib_paths("libjpg")
    434             end
    435             add_default_links({
    436                 win_names  = { "jpeg-6b" },
    437                 unix_names = { "jpeg" },
    438             })
    439         end,
    440     },
    441425    libpng = {
    442426        compile_settings = function()
    443427            if os.is("windows") or os.is("macosx") then

  • build/premake/premake4.lua

     
    814814        "opengl",
    815815        "libpng",
    816816        "zlib",
    817         "libjpg",
    818817        "valgrind",
    819818        "cxxtest",
    820819    }
    … …  
    898897    "opengl",
    899898    "sdl",
    900899
    901     "libjpg",
    902900    "libpng",
    903901    "zlib",
    904902

  • libraries/source/nvtt/src/src/nvconfig.h.in

     
    88#cmakedefine HAVE_MALLOC_H
    99
    1010#cmakedefine HAVE_PNG
    11 #cmakedefine HAVE_JPEG
    1211#cmakedefine HAVE_TIFF
    1312#cmakedefine HAVE_OPENEXR
    1413

  • source/lib/tex/tex_codec.cpp

     
    3636// Statically allocate all of the codecs...
    3737TexCodecDds DdsCodec;
    3838TexCodecPng PngCodec;
    39 TexCodecJpg JpgCodec;
    4039TexCodecTga TgaCodec;
    4140TexCodecBmp BmpCodec;
    4241// Codecs will be searched in this order
    4342static const ITexCodec *codecs[] = {(ITexCodec *)&DdsCodec, (ITexCodec *)&PngCodec,
    44     (ITexCodec *)&JpgCodec, (ITexCodec *)&TgaCodec, (ITexCodec *)&BmpCodec};
     43    (ITexCodec *)&TgaCodec, (ITexCodec *)&BmpCodec};
    4544static const int codecs_len = sizeof(codecs) / sizeof(ITexCodec*);
    4645
    4746// find codec that recognizes the desired output file extension,

  • source/lib/tex/tex_codec.h

     
    131131    };
    132132};
    133133
    134 class TexCodecJpg:ITexCodec {
    135 public:
    136     virtual Status decode(u8* data, size_t size, Tex* RESTRICT t) const;
    137     virtual Status encode(Tex* RESTRICT t, DynArray* RESTRICT da) const;
    138     virtual Status transform(Tex* t, size_t transforms) const;
    139     virtual bool is_hdr(const u8* file) const;
    140     virtual bool is_ext(const OsPath& extension) const;
    141     virtual size_t hdr_size(const u8* file) const;
    142     virtual const wchar_t* get_name() const {
    143         static const wchar_t *name = L"jpg";
    144         return name;
    145     };
    146 };
    147 
    148134class TexCodecDds:ITexCodec {
    149135public:
    150136    virtual Status decode(u8* data, size_t size, Tex* RESTRICT t) const;

  • source/tools/dist/0ad.nsi

     
    8080    File /r /x "public" /x "mod" /x "dev.cfg" "${CHECKOUTPATH}\binaries"
    8181  !else
    8282    ; Exclude debug DLLs and related files
    83     File /r /x "public" /x "mod" /x "dev.cfg" /x "*_d.dll" /x "enetd.dll" /x "FColladaD.dll" /x "gloox-1.0d.dll" /x "glooxwrapper_dbg.*" /x "jpeg-6bd.dll" /x "libcurld.dll" /x "libpng16d.dll" /x "miniupnpcd.dll" /x "mozjs*-ps-debug.*" /x "msvc*d.dll" /x "zlib1d.dll" "${CHECKOUTPATH}\binaries"
     83    File /r /x "public" /x "mod" /x "dev.cfg" /x "*_d.dll" /x "enetd.dll" /x "FColladaD.dll" /x "gloox-1.0d.dll" /x "glooxwrapper_dbg.*" /x "libcurld.dll" /x "libpng16d.dll" /x "miniupnpcd.dll" /x "mozjs*-ps-debug.*" /x "msvc*d.dll" /x "zlib1d.dll" "${CHECKOUTPATH}\binaries"
    8484  !endif
    8585
    8686  SetOutPath "$INSTDIR\binaries\data\mods\public"