@@ -1,4 +1,17 @@

 -------------------------------------------------------------------

+Sun Nov 29 12:31:27 UTC 2015 - avvissu@yandex.ru

+

+- Update to 15.11:

+  * introduces extended remote control from command line

+  * adds support of sTER chunk in PNG files identifying 

+    side-by-side format

+  * adds support of list of files within Drag & Drop. Two files are 

+    handled as stereo pair

+  * updates experimental DXVA2 decoder - more codecs are now 

+    supported

+  * fixes cursor hiding within NVIDIA 3D Vision output (Direct3D)

+

+-------------------------------------------------------------------

 Wed Oct 21 17:46:52 UTC 2015 - avvissu@yandex.ru

 - Update to 15.10:

​

@@ -16,10 +16,10 @@

 #

-%define src_ver 15_10

+%define src_ver 15_11

 %define src_name sView

 Name:           sview

-Version:        15.10

+Version:        15.11

 Release:        0

 Summary:        Stereoscopic media player

 License:        GPL-3.0+ and LGPL-3.0+

@@ -92,7 +92,7 @@

 %files

 %defattr(-,root,root)

-%doc LICENSE license-gpl* license-lgpl*

+%doc LICENSE*

 %{_bindir}/%{src_name}

 %{_libdir}/%{src_name}/

 %{_datadir}/applications/%{src_name}IV.desktop

​

@@ -1,1743 +0,0 @@

-From dad9d95e75f601c9b8864724bf68cf4a7f63ccaa Mon Sep 17 00:00:00 2001

-From: Kirill Gavrilov <kirill@sview.ru>

-Date: Wed, 7 Jan 2015 11:33:03 +0400

-Subject: [PATCH] lavc/dxva2: add ffmpeg calling dxva2 APIs

-

-Signed-off-by: weixuan wang <batmanwwx@gmail.com>

----

- configure                  |   4 +

- libavcodec/Makefile        |   4 +

- libavcodec/allcodecs.c     |   4 +

- libavcodec/dxva2_dec.c     | 356 +++++++++++++++++++++

- libavcodec/dxva2_wrapper.c | 777 +++++++++++++++++++++++++++++++++++++++++++++

- libavcodec/dxva2_wrapper.h | 389 +++++++++++++++++++++++

- libavcodec/mpeg12.h        |  23 ++

- libavcodec/mpeg12dec.c     |  20 --

- 8 files changed, 1557 insertions(+), 20 deletions(-)

- create mode 100644 libavcodec/dxva2_dec.c

- create mode 100644 libavcodec/dxva2_wrapper.c

- create mode 100644 libavcodec/dxva2_wrapper.h

-

-diff --git a/configure b/configure

-index c046e34..088a3d4 100755

---- a/configure

-+++ b/configure

-@@ -2273,6 +2273,7 @@ h263_vaapi_hwaccel_select="h263_decoder"

- h263_vdpau_hwaccel_deps="vdpau"

- h263_vdpau_hwaccel_select="h263_decoder"

- h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"

-+h264_dxva2_decoder_select="dxva2 h264_parser h264_decoder h264_dxva2_hwaccel"

- h264_dxva2_hwaccel_deps="dxva2"

- h264_dxva2_hwaccel_select="h264_decoder"

- h264_vaapi_hwaccel_deps="vaapi"

-@@ -2304,6 +2305,7 @@ mpeg2_vaapi_hwaccel_deps="vaapi"

- mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"

- mpeg2_vdpau_hwaccel_deps="vdpau"

- mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"

-+mpeg2video_dxva2_decoder_select="dxva2 mpeg2video_decoder mpeg2_dxva2_hwaccel"

- mpeg2_xvmc_hwaccel_deps="xvmc"

- mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"

- mpeg4_crystalhd_decoder_select="crystalhd"

-@@ -2315,6 +2317,7 @@ mpeg4_vdpau_hwaccel_deps="vdpau"

- mpeg4_vdpau_hwaccel_select="mpeg4_decoder"

- msmpeg4_crystalhd_decoder_select="crystalhd"

- vc1_crystalhd_decoder_select="crystalhd"

-+vc1_dxva2_decoder_select="dxva2 vc1_decoder vc1_dxva2_hwaccel"

- vc1_dxva2_hwaccel_deps="dxva2"

- vc1_dxva2_hwaccel_select="vc1_decoder"

- vc1_vaapi_hwaccel_deps="vaapi"

-@@ -2324,6 +2327,7 @@ vc1_vdpau_decoder_select="vc1_decoder"

- vc1_vdpau_hwaccel_deps="vdpau"

- vc1_vdpau_hwaccel_select="vc1_decoder"

- wmv3_crystalhd_decoder_select="crystalhd"

-+wmv3_dxva2_decoder_select="dxva2 wmv3_decoder wmv3_dxva2_hwaccel"

- wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"

- wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"

- wmv3_vdpau_decoder_select="vc1_vdpau_decoder"

-diff --git a/libavcodec/Makefile b/libavcodec/Makefile

-index fa0f53d..ffbb77c 100644

---- a/libavcodec/Makefile

-+++ b/libavcodec/Makefile

-@@ -259,6 +259,7 @@ OBJS-$(CONFIG_H264_DECODER)            += h264.o h264_cabac.o h264_cavlc.o \

-                                           h264_direct.o h264_loopfilter.o  \

-                                           h264_mb.o h264_picture.o h264_ps.o \

-                                           h264_refs.o h264_sei.o h264_slice.o

-+OBJS-$(CONFIG_H264_DXVA2_DECODER)      += dxva2_wrapper.o dxva2_dec.o

- OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o

- OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \

-                                           hevc_cabac.o hevc_refs.o hevcpred.o    \

-@@ -325,6 +326,7 @@ OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12dec.o mpeg12.o mpeg12data.o

- OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o

- OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o

- OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o

-+OBJS-$(CONFIG_MPEG2VIDEO_DXVA2_DECODER)+= dxva2_wrapper.o dxva2_dec.o

- OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o

- OBJS-$(CONFIG_MPEG4_DECODER)           += xvididct.o

- OBJS-$(CONFIG_MPL2_DECODER)            += mpl2dec.o ass.o

-@@ -482,6 +484,7 @@ OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1_block.o vc1_loopfilter.o

-                                           vc1dsp.o \

-                                           msmpeg4dec.o msmpeg4.o msmpeg4data.o \

-                                           wmv2dsp.o

-+OBJS-$(CONFIG_VC1_DXVA2_DECODER)       += dxva2_wrapper.o dxva2_dec.o

- OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o

- OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdaudio.o

- OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdvideo.o

-@@ -521,6 +524,7 @@ OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o wmv2dsp.o \

-                                           msmpeg4dec.o msmpeg4.o msmpeg4data.o

- OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o wmv2dsp.o \

-                                           msmpeg4.o msmpeg4enc.o msmpeg4data.o

-+OBJS-$(CONFIG_WMV3_DXVA2_DECODER)      += dxva2_wrapper.o dxva2_dec.o

- OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o

- OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.o

- OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.o

-diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c

-index 0d39d33..548f0ef 100644

---- a/libavcodec/allcodecs.c

-+++ b/libavcodec/allcodecs.c

-@@ -169,6 +169,7 @@ void avcodec_register_all(void)

-     REGISTER_ENCDEC (H263P,             h263p);

-     REGISTER_DECODER(H264,              h264);

-     REGISTER_DECODER(H264_CRYSTALHD,    h264_crystalhd);

-+    REGISTER_DECODER (H264_DXVA2, h264_dxva2);

-     REGISTER_DECODER(H264_VDA,          h264_vda);

-     REGISTER_DECODER(H264_VDPAU,        h264_vdpau);

-     REGISTER_DECODER(HEVC,              hevc);

-@@ -201,6 +202,7 @@ void avcodec_register_all(void)

- #endif /* FF_API_XVMC */

-     REGISTER_ENCDEC (MPEG1VIDEO,        mpeg1video);

-     REGISTER_ENCDEC (MPEG2VIDEO,        mpeg2video);

-+    REGISTER_DECODER (MPEG2VIDEO_DXVA2, mpeg2video_dxva2);

-     REGISTER_ENCDEC (MPEG4,             mpeg4);

-     REGISTER_DECODER(MPEG4_CRYSTALHD,   mpeg4_crystalhd);

-     REGISTER_DECODER(MPEG4_VDPAU,       mpeg4_vdpau);

-@@ -285,6 +287,7 @@ void avcodec_register_all(void)

-     REGISTER_DECODER(VBLE,              vble);

-     REGISTER_DECODER(VC1,               vc1);

-     REGISTER_DECODER(VC1_CRYSTALHD,     vc1_crystalhd);

-+    REGISTER_DECODER (VC1_DXVA2, vc1_dxva2);

-     REGISTER_DECODER(VC1_VDPAU,         vc1_vdpau);

-     REGISTER_DECODER(VC1IMAGE,          vc1image);

-     REGISTER_DECODER(VCR1,              vcr1);

-@@ -304,6 +307,7 @@ void avcodec_register_all(void)

-     REGISTER_ENCDEC (WMV2,              wmv2);

-     REGISTER_DECODER(WMV3,              wmv3);

-     REGISTER_DECODER(WMV3_CRYSTALHD,    wmv3_crystalhd);

-+    REGISTER_DECODER (WMV3_DXVA2, wmv3_dxva2);

-     REGISTER_DECODER(WMV3_VDPAU,        wmv3_vdpau);

-     REGISTER_DECODER(WMV3IMAGE,         wmv3image);

-     REGISTER_DECODER(WNV1,              wnv1);

-diff --git a/libavcodec/dxva2_dec.c b/libavcodec/dxva2_dec.c

-new file mode 100644

-index 0000000..e6b31cf

---- /dev/null

-+++ b/libavcodec/dxva2_dec.c

-@@ -0,0 +1,356 @@

-+/*

-+ * Call hardware decode acceleration through dxva2 API

-+ *

-+ * Copyright (c) 2012 Wei Gao <weigao@multicorewareinc.com>

-+ *

-+ * This file is part of FFmpeg.

-+ *

-+ * FFmpeg is free software; you can redistribute it and/or

-+ * modify it under the terms of the GNU Lesser General Public

-+ * License as published by the Free Software Foundation; either

-+ * version 2.1 of the License, or (at your option) any later version.

-+ *

-+ * FFmpeg is distributed in the hope that it will be useful,

-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-+ * Lesser General Public License for more details.

-+ *

-+ * You should have received a copy of the GNU Lesser General Public

-+ * License along with FFmpeg; if not, write to the Free Software

-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

-+ */

-+

-+#include <string.h>

-+#include "dxva2_wrapper.h"

-+#include "h264.h"

-+#include "vc1.h"

-+#include "mpeg12.h"

-+#include "avcodec.h"

-+#include "internal.h"

-+

-+#if CONFIG_H264_DXVA2_DECODER

-+extern AVCodec ff_h264_decoder,ff_h264_dxva2_decoder;

-+#endif

-+

-+#if CONFIG_MPEG2VIDEO_DXVA2_DECODER

-+extern AVCodec ff_mpeg2video_decoder,ff_mpeg2video_dxva2_decoder;

-+#endif

-+

-+#if CONFIG_VC1_DXVA2_DECODER

-+extern AVCodec ff_vc1_decoder,ff_vc1_dxva2_decoder;

-+#endif

-+

-+#if CONFIG_WMV3_DXVA2_DECODER

-+extern AVCodec ff_wmv3_decoder, ff_wmv3_dxva2_decoder;

-+#endif

-+

-+typedef union {

-+#if CONFIG_H264_DXVA2_DECODER

-+    H264Context        h264ctx;

-+#endif

-+#if CONFIG_VC1_DXVA2_DECODER || CONFIG_WMV3_DXVA2_DECODER

-+    VC1Context         vc1ctx;

-+#endif

-+#if CONFIG_MPEG2VIDEO_DXVA2_DECODER

-+    Mpeg1Context       mpeg2videoctx;

-+#endif

-+}DecoderContext;

-+

-+typedef struct {

-+    DecoderContext          decoderctx;

-+    enum AVPixelFormat      pix_fmt;

-+    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);

-+    AVCodec                 *hwcodec;

-+    AVCodec                 *codec;

-+    dxva2_context           dxva2_ctx;

​

@@ -1,61 +0,0 @@

-StShared,

-StGLWidget:

------------

-

-sources of these libraries are under Boost license. Read the file "license-boost.txt" for details.

-Notice that some sources are wrappers over other 3rd-parties

-and their licenses should be taken into account when used.

-

-StCore,

-StOutAnaglyph,

-StOutDual,

-StOutInterlace,

-StOutIZ3D,

-StOutPageFlip:

---------------

-

-these libraries are under the GNU Lesser General Public License version 3.0 or later.

-Read the file "license-lgpl-3.0.txt" for details.

-

-StImageViewer,

-StMoviePlayer,

-StDiagnostics,

-StMonitorsDump,

-StBrowserPlugin,

-StTests:

---------

-

-these libraries and programs are under the GNU General Public License version 3.0 or later.

-Read the file "license-gpl-3.0.txt" for details.

-

-sView:

-------

-

-sView executable project is a dummy entry point to real applications like StImageViewer.

-Formally it was licensed under Boost license terms.

-

-StCADViewer:

-------------

-

-this program is under the GNU General Public License version 3.0 or later.

-

-External libraries:

--------------------

-

-FFmpeg libraries are distributed under GNU Lesser General Public License version 2.1 or later.

-http://ffmpeg.org/

-

-libconfig++ library distributed under GNU Lesser General Public License version 2.1 or later.

-http://www.hyperrealm.com/libconfig/

-

-OpenAL library distributed under GNU Lesser General Public License version 2.1 or later.

-http://kcat.strangesoft.net/openal.html

-

-FreeType library distributed under FreeType License (BSD-style license with a credit clause).

-http://www.freetype.org/

-

-Open CASCADE Technology libraries distributed under GNU Lesser General Public License version 2.1.

-http://dev.opencascade.org/

-

-Some 3rd-parties may depend on other libraries and provide more license options.

-Please read license information for original projects.

​

@@ -1,24 +0,0 @@

-sView - stereoscopic media player

-=================================

-

-0) Updates

-----------

-

-* To get up-to-date sources please clone official git repository:

-  git clone https://github.com/gkv311/sview.git

-

-1) Documentation

-----------------

-

-* Read the documentation in the doc/ directory in git.

-  Online help is available on official site http://www.sview.ru/en/sview2009/usertips

-

-2) Licensing

-------------

-

-* See the LICENSE file.

-

-3) Build and Install

---------------------

-

-* See the docs/INSTALL file.

​

@@ -1,113 +0,0 @@

-I. Installing 3rd-parties

-=========================

-

-sView requires several 3rd-party components for building:

-- C/C++ compiler (g++, MSVC 2010+)

-- Code::Blocks (http://www.codeblocks.org)

-- FFmpeg (http://www.ffmpeg.org)

-- OpenAL soft (http://kcat.strangesoft.net/openal.html)

-- libwebp, optional (https://developers.google.com/speed/webp/download)

-- GTK2+, Linux only (http://www.gtk.org)

-- libconfig++, Linux and Android (http://www.hyperrealm.com/libconfig)

-- libxpm, Linux only

-

-On Debian/Ubuntu you might use the following command to install all dependencies at once:

-

-sudo apt-get install \

- g++ \

- libgtk2.0-dev \

- libopenal-dev \

- libgl1-mesa-dev \

- libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswscale-dev \

- libwebp-dev \

- libconfig++-dev libconfig-dev \

- libxpm-dev \

- codeblocks

-

-The similar command for RPM-based distributives:

-

-yum install gcc gcc-c++ \

- gtk+-devel gtk2-devel \

- mesa-libGLU-devel glew-devel \

- openal-devel \

- libconfig-devel

-

-rpm -Uvh http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm

-yum install ffmpeg-devel

-

-On Windows and Mac OS X please refer to official documentation for each project.

-Notice that DevIL and FreeImage libraries are optional and need not for building sView

-(libraries are loaded dynamically if available).

-

-II. Makefile on Linux

-=====================

-

-Current Makefile has been written only for DEB/RPM source packages

-and lacks configuration flexibility (means ther NO any ./configure and so on).

-

-All you need is to install dependencies and to execute traditional commands:

-

-  make && make install

-

-III. Code::Blocks

-=================

-

-Code::Blocks is an official way for building and development of sView.

-There are several building targets depending on platform

-(Mac OS X, Linux, Windows) and debugging possibilities:

-- WIN_vc_x86,        32-bit target using Visual Studio compiler

-- WIN_vc_x86_DEBUG,  32-bit target with debugging options

-- WIN_vc_AMD64,      64-bit target using Visual Studio compiler

-- LINUX_gcc,         Linux target, g++ compiler

-- LINUX_gcc_DEBUG,   Linux target with debugging options

-- MAC_gcc,           Mac OS X target, g++ compatible compiler

-- MAC_gcc_DEBUG,     Mac OS X target with debugging options

-

-Notice that the following compilers should be configured within Code::Blocks:

-- gcc,               configured to g++ or compatible compiler (on systems other than Windows)

-- msvc10,            configured to Visual Studio 2010+ compiler, PSDK and DXSDK

-- windows_sdk_x86_64 (copy of msvc10) configured to 64-bit libraries and compiler toolchain

-

-3rd-parties should be either configured as Code::Blocks global compiler options

-or placed into "3rdparty" folder.

-

-IV. Building options

-====================

-

-Several preprocessor directives control building options.

-Notice that by default "include/stconfig.conf" file is used to override these options

-(this file will be used only when ST_HAVE_STCONFIG is defined).

-

-- ST_HAVE_WEBP - should be defined to activate libwebp usage

-  (notice that since next releases of FFmpeg might have built-in support for webp/webpll image files)

-- ST_HAVE_MONGOOSE - should be defined to activate built-in web UI for remote Movie Player control

-- ST_HAVE_OCCT - should be defined to activate CAD files import in tiny CAD viewer

-- ST_DEBUG - should be defined to activate debugging log output

-- ST_DEBUG_LOG_TO_FILE - specifies file name or full path to duplicate debug log output

-

-V. Distribution scripts

-=======================

-

-Several script were written to automate distribution routines.

-All them were placed in "distribution" folder.

-

-- build.bat, batch script for Windows. Performs re-building of WIN_vc_x86 and WIN_vc_AMD64 targets

-  using Code::Blocks and pack result binaries using InnoSetup script.

-  Notice that all dependencies should be available (including InnoSetup),

-  and DLLs should be placed into bin/WIN_vc_x86 and bin/WIN_vc_AMD64 folders.

-- buildDebSrc.sh, bash script for Linux to pack sources into Debian source package.

-- buildMac.sh, bash script to pack binaries from bin/MAC_gcc folder into DMG image.

-  3rd-party libraries should be already located in "bin/MAC_gcc_DEBUG/sView.app/Contents/Frameworks/"

-  folder with correct search path (refer to bind_frameworks.sh auxiliary script).

-

-===

-

-su

-yum install rpm-build

-

-mkdir -p ${HOME}/workspace/redhat/{RPMS,SRPMS,SPECS,SOURCES,BUILD}

-echo "%_topdir ${HOME}/workspace/redhat" > ${HOME}/.rpmmacros

-

-wget https://launchpad.net/~sview/+archive/stable/+files/sview_12.05-1%7Eprecise.tar.gz

-mv sview_12.05-1~precise.tar.gz $HOME/workspace/redhat/SOURCES/sview_12.05-1.tar.gz

-rpmbuild -ba distribution/sView.rpm.spec

​

@@ -1,91 +0,0 @@

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<!-- Created with Inkscape (http://www.inkscape.org/) -->

-

-<svg

-   xmlns:dc="http://purl.org/dc/elements/1.1/"

-   xmlns:cc="http://creativecommons.org/ns#"

-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

-   xmlns:svg="http://www.w3.org/2000/svg"

-   xmlns="http://www.w3.org/2000/svg"

-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   width="32"

-   height="32"

-   id="svg2"

-   version="1.1"

-   inkscape:version="0.48.2 r9819"

-   sodipodi:docname="fullscr.svg"

-   inkscape:export-filename="fullScreen32.png"

-   inkscape:export-xdpi="107.66355"

-   inkscape:export-ydpi="107.66355">

-  <defs

-     id="defs4" />

-  <sodipodi:namedview

-     id="base"

-     pagecolor="#ffffff"

-     bordercolor="#666666"

-     borderopacity="1.0"

-     inkscape:pageopacity="0.0"

-     inkscape:pageshadow="2"

-     inkscape:zoom="16.8125"

-     inkscape:cx="14.929368"

-     inkscape:cy="16"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     showgrid="false"

-     inkscape:window-width="1213"

-     inkscape:window-height="756"

-     inkscape:window-x="67"

-     inkscape:window-y="0"

-     inkscape:window-maximized="0" />

-  <metadata

-     id="metadata7">

-    <rdf:RDF>

-      <cc:Work

-         rdf:about="">

-        <dc:format>image/svg+xml</dc:format>

-        <dc:type

-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

-        <dc:title></dc:title>

-      </cc:Work>

-    </rdf:RDF>

-  </metadata>

-  <g

-     inkscape:label="Layer 1"

-     inkscape:groupmode="layer"

-     id="layer1"

-     transform="translate(0,-1020.3622)">

-    <path

-       sodipodi:type="arc"

-       style="fill:#808080;fill-opacity:0.45814981;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       id="path2985"

-       sodipodi:cx="11.271376"

-       sodipodi:cy="13.769517"

-       sodipodi:rx="12.877323"

-       sodipodi:ry="12.877323"

-       d="m 24.148699,13.769517 a 12.877323,12.877323 0 1 1 -25.7546465,0 12.877323,12.877323 0 1 1 25.7546465,0 z"

-       transform="translate(4.6988847,1022.6818)" />

-    <path

-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="m 8.386617,1035.2321 0.05948,-6.4238 6.245353,-0.06 z"

-       id="path3755"

-       inkscape:connector-curvature="0"

-       sodipodi:nodetypes="cccc" />

-    <path

-       sodipodi:type="arc"

-       style="fill:#000000;fill-opacity:1"

-       id="path3792"

-       sodipodi:cx="16.08922"

-       sodipodi:cy="16.684015"

-       sodipodi:rx="1.457249"

-       sodipodi:ry="1.457249"

-       d="m 17.546469,16.684015 a 1.457249,1.457249 0 1 1 -2.914498,0 1.457249,1.457249 0 1 1 2.914498,0 z"

-       transform="translate(-0.11895969,1019.7673)" />

-    <path

-       sodipodi:nodetypes="cccc"

-       inkscape:connector-curvature="0"

-       id="path3813"

-       d="m 23.434944,1037.4918 -0.05948,6.4238 -6.245353,0.06 z"

-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />

-  </g>

-</svg>

​

@@ -0,0 +1,94 @@

+From 104e5d8f212c46b9eedb932a6b6c717372ccdceb Mon Sep 17 00:00:00 2001

+From: Kirill Gavrilov <kirill@sview.ru>

+Date: Thu, 22 Oct 2015 23:36:52 +0300

+Subject: [PATCH 1/1] avcodec/png: read and write stereo3d frame side data

+ information

+

+Use optional sTER chunk defining side-by-side stereo pair

+within "Extensions to the PNG 1.2 Specification", version 1.3.0.

+---

+ libavcodec/pngdec.c | 16 ++++++++++++++++

+ libavcodec/pngenc.c | 19 +++++++++++++++++++

+ 2 files changed, 35 insertions(+)

+

+diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c

+index 4cfdc58..99111d4 100644

+--- a/libavcodec/pngdec.c

++++ b/libavcodec/pngdec.c

+@@ -24,6 +24,7 @@

+ #include "libavutil/avassert.h"

+ #include "libavutil/bprint.h"

+ #include "libavutil/imgutils.h"

++#include "libavutil/stereo3d.h"

+ #include "avcodec.h"

+ #include "bytestream.h"

+ #include "internal.h"

+@@ -1164,6 +1165,21 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s,

+                 av_log(avctx, AV_LOG_WARNING, "Broken zTXt chunk\n");

+             bytestream2_skip(&s->gb, length + 4);

+             break;

++        case MKTAG('s', 'T', 'E', 'R'): {

++            AVStereo3D *stereo3d = av_stereo3d_create_side_data(p);

++            if (!stereo3d) {

++                goto fail;

++            } else if (*s->gb.buffer == 0) {

++                stereo3d->type  = AV_STEREO3D_SIDEBYSIDE;

++                stereo3d->flags = AV_STEREO3D_FLAG_INVERT;

++            } else if (*s->gb.buffer == 1) {

++                stereo3d->type  = AV_STEREO3D_SIDEBYSIDE;

++            } else {

++                 av_log(avctx, AV_LOG_WARNING, "Broken sTER chunk - unknown value\n");

++            }

++            bytestream2_skip(&s->gb, length + 4);

++            break;

++        }

+         case MKTAG('I', 'E', 'N', 'D'):

+             if (!(s->state & PNG_ALLIMAGE))

+                 av_log(avctx, AV_LOG_ERROR, "IEND without all image\n");

+diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c

+index 4204df2..bc61f8f 100644

+--- a/libavcodec/pngenc.c

++++ b/libavcodec/pngenc.c

+@@ -31,6 +31,7 @@

+ #include "libavutil/libm.h"

+ #include "libavutil/opt.h"

+ #include "libavutil/color_utils.h"

++#include "libavutil/stereo3d.h"

+ 

+ #include <zlib.h>

+ 

+@@ -340,6 +341,7 @@ static int png_get_gama(enum AVColorTransferCharacteristic trc, uint8_t *buf)

+ 

+ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict)

+ {

++    AVFrameSideData *side_data;

+     PNGEncContext *s = avctx->priv_data;

+ 

+     /* write png header */

+@@ -364,6 +366,23 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict)

+     }

+     png_write_chunk(&s->bytestream, MKTAG('p', 'H', 'Y', 's'), s->buf, 9);

+ 

++    /* write stereoscopic information */

++    side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_STEREO3D);

++    if (side_data) {

++        AVStereo3D *stereo3d = (AVStereo3D *)side_data->data;

++        switch (stereo3d->type) {

++            case AV_STEREO3D_SIDEBYSIDE:

++                s->buf[0] = ((stereo3d->flags & AV_STEREO3D_FLAG_INVERT) == 0) ? 1 : 0;

++                png_write_chunk(&s->bytestream, MKTAG('s', 'T', 'E', 'R'), s->buf, 1);

++                break;

++            case AV_STEREO3D_2D:

++                break;

++            default:

++                av_log(avctx, AV_LOG_WARNING, "Only side-by-side stereo3d flag can be defined within sTER chunk\n");

++                break;

++        }

++    }

++

+     /* write colorspace information */

+     if (pict->color_primaries == AVCOL_PRI_BT709 &&

+         pict->color_trc == AVCOL_TRC_IEC61966_2_1) {

+-- 

+2.0.1

+

​

@@ -10,6 +10,8 @@

 rebuildAndroid="false"

 compilerPrefix=""

 androidNdkRoot="~/develop/android-ndk-r10"

+aSystem=`uname -s`

+aPwdBack=$PWD

 for i in $*

 do

@@ -70,10 +72,25 @@

   OUTPUT_NAME="$OUTPUT_NAME-debug"

 fi

 OUTPUT_FOLDER="../$OUTPUT_NAME"

+OUTPUT_FOLDER_INC="$OUTPUT_FOLDER/include"

+OUTPUT_FOLDER_BIN="$OUTPUT_FOLDER/bin"

+OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/lib"

+if [ "$aSystem" == "Darwin" ]; then

+  OUTPUT_FOLDER_BIN="$OUTPUT_FOLDER/MacOS"

+  OUTPUT_FOLDER_LIB="$OUTPUT_FOLDER/Frameworks"

+fi

 rm -f -r $OUTPUT_FOLDER

 mkdir -p $OUTPUT_FOLDER

-mkdir -p $OUTPUT_FOLDER/bin

-mkdir -p $OUTPUT_FOLDER/lib

+mkdir -p $OUTPUT_FOLDER_BIN

+mkdir -p $OUTPUT_FOLDER_LIB

+mkdir -p $OUTPUT_FOLDER_INC

+mkdir -p $OUTPUT_FOLDER_INC/libavcodec

+mkdir -p $OUTPUT_FOLDER_INC/libavdevice

+mkdir -p $OUTPUT_FOLDER_INC/libavfilter

+mkdir -p $OUTPUT_FOLDER_INC/libavformat

+mkdir -p $OUTPUT_FOLDER_INC/libavutil

+mkdir -p $OUTPUT_FOLDER_INC/libswscale

+mkdir -p $OUTPUT_FOLDER_INC/libswresample

 echo "  make distclean"

 make distclean &>/dev/null

@@ -89,21 +106,21 @@

   fi

 fi

+#--enable-memalign-hack

 configArguments="\

  --extra-version=sView.ru \

  --enable-swscale \

  --enable-shared \

  --disable-static \

- --enable-memalign-hack \

  --enable-avfilter \

  --enable-hardcoded-tables \

  --enable-pthreads \

  --disable-libopenjpeg \

+ --disable-doc \

  --enable-runtime-cpudetect"

-aSystem=`uname -s`

 if [ "$aSystem" == "Darwin" ]; then

-  configArguments="$configArguments --enable-vda"

+  configArguments="$configArguments --enable-vda --libdir=@executable_path/../Frameworks"

 fi

 #if [ "$gccMachine" != "$GCC_MACHINE_LINUX_64" ]; then

@@ -156,7 +173,7 @@

 echo "  ./configure $configArguments"

 echo

 if [ "$rebuildAndroid" == "true" ]; then

-  ./configure $configArguments --disable-symver --extra-cflags='-fno-builtin-sin -fno-builtin-sinf' >$OUTPUT_FOLDER/config.log 2>&1

+  ./configure $configArguments --disable-symver --extra-cflags='-march=armv7-a -mfloat-abi=softfp -fno-builtin-sin -fno-builtin-sinf' >$OUTPUT_FOLDER/config.log 2>&1

 else

   ./configure $configArguments >$OUTPUT_FOLDER/config.log 2>&1

 fi

@@ -178,85 +195,96 @@

   cp -f libavcodec/*.dll $OUTPUT_FOLDER

   cp -f libavcodec/*.lib $OUTPUT_FOLDER &>/dev/null

 elif [ -f libavcodec/libavcodec.dylib ]; then

-  cp -f -p libavcodec/*.dylib* $OUTPUT_FOLDER/lib

+  cp -f -p -R libavcodec/*.dylib* $OUTPUT_FOLDER_LIB

 else

-  cp -f -d libavcodec/*.so* $OUTPUT_FOLDER/lib

+  cp -f -d libavcodec/*.so* $OUTPUT_FOLDER_LIB

 fi

 if [ -f libavdevice/avdevice.dll ]; then

   cp -f libavdevice/*.dll $OUTPUT_FOLDER

   cp -f libavdevice/*.lib $OUTPUT_FOLDER &>/dev/null

 elif [ -f libavdevice/libavdevice.dylib ]; then

-  cp -f -p libavdevice/*.dylib* $OUTPUT_FOLDER/lib

+  cp -f -p -R libavdevice/*.dylib* $OUTPUT_FOLDER_LIB

 else

-  cp -f -d libavdevice/*.so* $OUTPUT_FOLDER/lib

+  cp -f -d libavdevice/*.so* $OUTPUT_FOLDER_LIB

 fi

 if [ -f libavfilter/avfilter.dll ]; then

   cp -f libavfilter/*.dll $OUTPUT_FOLDER

   cp -f libavfilter/*.lib $OUTPUT_FOLDER &>/dev/null

 elif [ -f libavfilter/libavfilter.dylib ]; then

-  cp -f -p libavfilter/*.dylib* $OUTPUT_FOLDER/lib

+  cp -f -p -R libavfilter/*.dylib* $OUTPUT_FOLDER_LIB

 else

-  cp -f -d libavfilter/*.so* $OUTPUT_FOLDER/lib

+  cp -f -d libavfilter/*.so* $OUTPUT_FOLDER_LIB

 fi

 if [ -f libavformat/avformat.dll ]; then

   cp -f libavformat/*.dll $OUTPUT_FOLDER

   cp -f libavformat/*.lib $OUTPUT_FOLDER &>/dev/null

 elif [ -f libavformat/libavformat.dylib ]; then

-  cp -f -p libavformat/*.dylib* $OUTPUT_FOLDER/lib

+  cp -f -p -R libavformat/*.dylib* $OUTPUT_FOLDER_LIB

 else

-  cp -f -d libavformat/*.so* $OUTPUT_FOLDER/lib

+  cp -f -d libavformat/*.so* $OUTPUT_FOLDER_LIB

 fi

 if [ -f libavutil/avutil.dll ]; then

   cp -f libavutil/*.dll $OUTPUT_FOLDER

   cp -f libavutil/*.lib $OUTPUT_FOLDER &>/dev/null

 elif [ -f libavutil/libavutil.dylib ]; then

-  cp -f -p libavutil/*.dylib* $OUTPUT_FOLDER/lib

+  cp -f -p -R libavutil/*.dylib* $OUTPUT_FOLDER_LIB

 else

-  cp -f -d libavutil/*.so* $OUTPUT_FOLDER/lib

+  cp -f -d libavutil/*.so* $OUTPUT_FOLDER_LIB

 fi

 if [ -f libswscale/swscale.dll ]; then

   cp -f libswscale/*.dll $OUTPUT_FOLDER

   cp -f libswscale/*.lib $OUTPUT_FOLDER &>/dev/null

 elif [ -f libswscale/libswscale.dylib ]; then

-  cp -f -p libswscale/*.dylib* $OUTPUT_FOLDER/lib

+  cp -f -p -R libswscale/*.dylib* $OUTPUT_FOLDER_LIB

 else

-  cp -f -d libswscale/*.so* $OUTPUT_FOLDER/lib

+  cp -f -d libswscale/*.so* $OUTPUT_FOLDER_LIB

 fi

 if [ -f libswresample/swresample.dll ]; then

   cp -f libswresample/*.dll $OUTPUT_FOLDER

   cp -f libswresample/*.lib $OUTPUT_FOLDER &>/dev/null

 elif [ -f libswresample/libswresample.dylib ]; then

-  cp -f -p libswresample/*.dylib* $OUTPUT_FOLDER/lib

+  cp -f -p -R libswresample/*.dylib* $OUTPUT_FOLDER_LIB

 else

-  cp -f -d libswresample/*.so* $OUTPUT_FOLDER/lib

+  cp -f -d libswresample/*.so* $OUTPUT_FOLDER_LIB

 fi

 cp -f *.exe      $OUTPUT_FOLDER &>/dev/null

-cp -f ffmpeg     $OUTPUT_FOLDER/bin &>/dev/null

-cp -f ffmpeg_g   $OUTPUT_FOLDER/bin &>/dev/null

-cp -f ffprobe    $OUTPUT_FOLDER/bin &>/dev/null

-cp -f ffprobe_g  $OUTPUT_FOLDER/bin &>/dev/null

-cp -f ffserver   $OUTPUT_FOLDER/bin &>/dev/null

-cp -f ffserver_g $OUTPUT_FOLDER/bin &>/dev/null

-cp -f ffplay     $OUTPUT_FOLDER/bin &>/dev/null

+cp -f ffmpeg     $OUTPUT_FOLDER_BIN &>/dev/null

+cp -f ffmpeg_g   $OUTPUT_FOLDER_BIN &>/dev/null

+cp -f ffprobe    $OUTPUT_FOLDER_BIN &>/dev/null

+cp -f ffprobe_g  $OUTPUT_FOLDER_BIN &>/dev/null

+cp -f ffserver   $OUTPUT_FOLDER_BIN &>/dev/null

+cp -f ffserver_g $OUTPUT_FOLDER_BIN &>/dev/null

+cp -f ffplay     $OUTPUT_FOLDER_BIN &>/dev/null

+

+cp -f libavcodec/*.h    $OUTPUT_FOLDER_INC/libavcodec    &>/dev/null

+cp -f libavdevice/*.h   $OUTPUT_FOLDER_INC/libavdevice   &>/dev/null

+cp -f libavfilter/*.h   $OUTPUT_FOLDER_INC/libavfilter   &>/dev/null

+cp -f libavformat/*.h   $OUTPUT_FOLDER_INC/libavformat   &>/dev/null

+cp -f libavutil/*.h     $OUTPUT_FOLDER_INC/libavutil     &>/dev/null

+cp -f libswscale/*.h    $OUTPUT_FOLDER_INC/libswscale    &>/dev/null

+cp -f libswresample/*.h $OUTPUT_FOLDER_INC/libswresample &>/dev/null

 # remove duplicates (only Windows)

 rm $OUTPUT_FOLDER/avcodec.dll $OUTPUT_FOLDER/swresample.dll $OUTPUT_FOLDER/avdevice.dll $OUTPUT_FOLDER/avfilter.dll $OUTPUT_FOLDER/avformat.dll $OUTPUT_FOLDER/avutil.dll $OUTPUT_FOLDER/swscale.dll &>/dev/null

 # create binaries archive

-if command -v 7za &>/dev/null

+if [ "$aSystem" == "Darwin" ]; then

+  rm $OUTPUT_FOLDER/../$OUTPUT_NAME.tar.gz &>/dev/null

+  cd $OUTPUT_FOLDER

+  tar -cvzf $OUTPUT_FOLDER/../$OUTPUT_NAME.tar.gz *

+elif command -v 7za &>/dev/null

 then

-  # binaries

   rm $OUTPUT_FOLDER/../$OUTPUT_NAME.7z &>/dev/null

   7za a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $OUTPUT_FOLDER/../$OUTPUT_NAME.7z $OUTPUT_FOLDER

-  rm -f -r $OUTPUT_FOLDER

 fi

 # come back

-cd ..

+cd $aPwdBack

+#rm -f -r $OUTPUT_FOLDER

​

@@ -2,15 +2,15 @@

 # This is helpful script to perform building of FFmpeg

-# MinGW tools for Ubuntu; http://ffmpeg.arrozcru.org/wiki/index.php?title=Aptrepository

-# Add gpg key to your system 

-#$ gpg --keyserver keyserver.ubuntu.com --recv-key 0x25E635F9

-#$ gpg --export --armor 0x25E635F9 | sudo apt-key add -

-#deb http://apt.arrozcru.org ./

-#deb-src http://apt.arrozcru.org ./

+# mingw for cross-compiling

+#sudo apt-get install binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 gcc-mingw-w64 gcc-mingw-w64-base gcc-mingw-w64-i686 gcc-mingw-w64-x86-64

+#sudo apt-get install mingw-w64 mingw-w64-common mingw-w64-tools yasm p7zip-full git git-gui gitk

-#sudo apt-get install mingw32-w32api mingw32-runtime mingw32-gcc-4.4 mingw32-binutils mingw32-zlib mingw32-bzip2 mingw32-pthreads 

-#sudo apt-get install mingw-w64-w32api mingw-w64-runtime mingw-w64-gcc-4.4 mingw-w64-crt mingw-w64-binutils mingw-w64-headers mingw-w64-zlib mingw-w64-bzip2 mingw-w64-pthreads

+# avoid linkage with dynamic version of libwinpthread.dll

+#sudo mv /usr/x86_64-w64-mingw32/lib/libpthread.dll.a /usr/x86_64-w64-mingw32/lib/__libpthread.dll.a

+#sudo mv /usr/x86_64-w64-mingw32/lib/libwinpthread.dll.a /usr/x86_64-w64-mingw32/lib/__libwinpthread.dll.a

+#sudo mv /usr/i686-w64-mingw32/lib/libpthread.dll.a /usr/i686-w64-mingw32/lib/__libpthread.dll.a

+#sudo mv /usr/i686-w64-mingw32/lib/libwinpthread.dll.a /usr/i686-w64-mingw32/lib/__libwinpthread.dll.a

 rebuildTarget="FFmpeg"

 if [ "$1" != "" ]; then

@@ -35,10 +35,10 @@

 fi

 # build for Win32 x86

-#./rebuild.sh "$rebuildTarget" GPL  DEBUG   "i686-mingw32-"

-./rebuild.sh "$rebuildTarget" LGPL DEBUG   "i686-mingw32-"

-./rebuild.sh "$rebuildTarget" GPL  RELEASE "i686-mingw32-"

-./rebuild.sh "$rebuildTarget" LGPL RELEASE "i686-mingw32-"

+#./rebuild.sh "$rebuildTarget" GPL  DEBUG   "i686-w64-mingw32-"

+./rebuild.sh "$rebuildTarget" LGPL DEBUG   "i686-w64-mingw32-"

+./rebuild.sh "$rebuildTarget" GPL  RELEASE "i686-w64-mingw32-"

+./rebuild.sh "$rebuildTarget" LGPL RELEASE "i686-w64-mingw32-"

 # build for Win32 AMD64

 #./rebuild.sh "$rebuildTarget" GPL  DEBUG   "x86_64-w64-mingw32-"

​

@@ -0,0 +1,60 @@

+## Libraries

+

+* StShared

+* StGLWidget

+* StCore

+* StOutAnaglyph

+* StOutDual

+* StOutInterlace

+* StOutIZ3D

+* StOutPageFlip

+

+Sources of these libraries are under Boost license.

+Read the file [license-boost.txt](license-boost.txt) for details.

+

+Notice that some sources are wrappers over other 3rd-parties

+and their licenses should be taken into account when used.

+

+## sView

+

+* StImageViewer

+* StMoviePlayer

+* StDiagnostics

+* StMonitorsDump

+* StBrowserPlugin

+* StTests

+

+These libraries and programs are under the GNU General Public License version 3.0 or later.<br/>

+Read the file [license-gpl-3.0.txt](license-gpl-3.0.txt) for details.

+

+Note that sView executable project is a dummy entry point to real applications like StImageViewer.<br/>

+Formally it was licensed under Boost license terms.

+

+## StCADViewer

+

+This program is under the GNU General Public License version 3.0 or later.

+

+## External libraries

+

+* FFmpeg libraries are distributed under GNU Lesser General Public License version 2.1 or later.<br/>

+  http://ffmpeg.org/

+* libconfig++ library distributed under GNU Lesser General Public License version 2.1 or later.<br/>

+  http://www.hyperrealm.com/libconfig/

+* OpenAL library distributed under GNU Lesser General Public License version 2.1 or later.<br/>

+  http://kcat.strangesoft.net/openal.html

+* FreeType library distributed under FreeType License (BSD-style license with a credit clause).<br/>

+  http://www.freetype.org/

+* Open CASCADE Technology libraries distributed under GNU Lesser General Public License version 2.1.<br/>

+  http://dev.opencascade.org/

+

+Some 3rd-parties may depend on other libraries and provide more license options.

+Please read license information for original projects.

+

+## Icons

+

+Images in folders [texturesSrc](texturesSrc) and [textures](textures)

+are available under the [license CC-BY 4.0](license-CC-BY-4.0.txt) (Creative Common Attribution 4.0 International License).

+Feel free to remix and re-share these icons in your products.

+

+Some of the images have been derived from Material Design icons shared by Google:<br/>

+https://github.com/google/material-design-icons

​

@@ -0,0 +1,39 @@

+sView - stereoscopic media player

+=================================

+

+sView is an easy to use cross-platform solution to view 3D stereoscopic videos and images.

+Please visit official site for more information:<br/>

+http://www.sview.ru

+

+## Libraries

+

+* `libStShared` threads, mutexes, template-based signals and slots, OpenGL tools, settings management, and other tools.

+* `libStGLWidgets` compact C++ toolkit for writing GUI using OpenGL 2.1+ or OpenGL ES 2.0+.

+* `libStCore` window system independent C++ toolkit for writing OpenGL applications.

+* `libStOutAnaglyph` stereoscopic output in anaglyph format using GLSL programs.

+* `libStOutDistorted` stereoscopic output in anamorph side-by-side format.

+* `libStOutDual` stereoscopic output through two dedicated interfaces.

+* `libStOutInterlace` stereoscopic output for row interlaced displays using GLSL programs.

+* `libStOutIZ3D` stereoscopic output for iZ3D monitors using GLSL programs.

+* `libStOutPageFlip` stereoscopic output for shutter glasses devices.

+

+## Updates

+

+To get up-to-date sources please clone official git repository:

+~~~~~

+  git clone https://github.com/gkv311/sview.git

+~~~~~

+

+## Documentation

+

+Read the documentation in the **doc/** directory in git.

+Online help is available on official site:<br/>

+http://www.sview.ru/en/sview/usertips/

+

+## Licensing

+

+See the [LICENSE](LICENSE.md) file.

+

+## Build and Install

+

+See the [docs/INSTALL](docs/INSTALL.md) file.

​

@@ -6,32 +6,6 @@

        <Option pch_mode="2" />

        <Option compiler="gcc" />

        <Build>

-           <Target title="WIN_gcc_x86">

-               <Option output="../bin/$(TARGET_NAME)/npStBrowserPlugin" prefix_auto="1" extension_auto="1" />

-               <Option object_output="obj/$(TARGET_NAME)/" />

-               <Option type="3" />

-               <Option compiler="gcc" />

-               <Compiler>

-                   <Add option="-O3" />

-                   <Add option="-std=c++0x" />

-                   <Add option="-Wall" />

-                   <Add option="-g" />

-                   <Add option="-shared" />

-                   <Add option="-mmmx" />

-                   <Add option="-msse" />

-                   <Add option="-DUNICODE" />

-                   <Add option="-DST_DEBUG" />

-                   <Add option="-D__MSVCRT_VERSION__=0x0601" />

-                   <Add option="-DST_HAVE_STCONFIG" />

-               </Compiler>

-               <Linker>

-                   <Add option="--input-def StBrowserPluginNPAPI.def" />

-                   <Add library="user32" />

-                   <Add library="advapi32" />

-                   <Add library="shell32" />

-                   <Add library="Version" />

-               </Linker>

-           </Target>

            <Target title="WIN_vc_x86">

                <Option output="../bin/$(TARGET_NAME)/npStBrowserPlugin" prefix_auto="1" extension_auto="1" />

                <Option object_output="obj/$(TARGET_NAME)/" />

@@ -65,11 +39,11 @@

                    <Add before='midl /nologo /win32 /W1 $res_includes /client none /tlb &quot;$(TARGET_OBJECT_DIR)\StActiveX.idl.tlb&quot; StActiveX.idl' />

                </ExtraCommands>

            </Target>

-           <Target title="WIN_vc_x86_DEBUG">

+           <Target title="WIN_vc_AMD64_DEBUG">

                <Option output="../bin/$(TARGET_NAME)/npStBrowserPlugin" prefix_auto="1" extension_auto="1" />

                <Option object_output="obj/$(TARGET_NAME)/" />

                <Option type="3" />

-               <Option compiler="msvc10" />

+               <Option compiler="windows_sdk_x86_64" />

                <Compiler>

                    <Add option="/MDd" />

                    <Add option="/Od" />

@@ -95,7 +69,7 @@

                    <Add library="advapi32" />

                    <Add library="shell32" />

                    <Add library="Version" />

-                   <Add directory="../3rdparty/atlmfc/lib" />

+                   <Add directory="../3rdparty/atlmfc/lib/amd64" />

                </Linker>

                <ExtraCommands>

                    <Add before='cmd /c IF NOT EXIST &quot;$(TARGET_OBJECT_DIR)&quot; MKDIR &quot;$(TARGET_OBJECT_DIR)&quot;' />

@@ -255,40 +229,33 @@

        <Unit filename="NSPluginBase.h" />

        <Unit filename="StActiveX.idl">

            <Option target="WIN_vc_x86" />

-           <Option target="WIN_vc_x86_DEBUG" />

+           <Option target="WIN_vc_AMD64_DEBUG" />

            <Option target="WIN_vc_AMD64" />

        </Unit>

        <Unit filename="StActiveXCtrl.cpp">

            <Option weight="40" />

            <Option target="WIN_vc_x86" />

-           <Option target="WIN_vc_x86_DEBUG" />

+           <Option target="WIN_vc_AMD64_DEBUG" />

            <Option target="WIN_vc_AMD64" />

        </Unit>

        <Unit filename="StActiveXCtrl.h" />

        <Unit filename="StActiveXModule.cpp">

            <Option target="WIN_vc_x86" />

-           <Option target="WIN_vc_x86_DEBUG" />

+           <Option target="WIN_vc_AMD64_DEBUG" />

            <Option target="WIN_vc_AMD64" />

        </Unit>

        <Unit filename="StActiveXModule.h" />

        <Unit filename="StBrPluginInfo.h" />

        <Unit filename="StBrowserPlugin.cpp" />

-       <Unit filename="StBrowserPlugin.def">

-           <Option target="WIN_gcc_x86" />

-       </Unit>

        <Unit filename="StBrowserPlugin.h" />

        <Unit filename="StBrowserPlugin.rc">

            <Option compilerVar="WINDRES" />

            <Option compiler="windows_sdk_x86_64" use="1" buildCommand='$rescomp -DST_OCX_TLB_PATH=&quot;$(TARGET_OBJECT_DIR)/StActiveX.idl.tlb&quot; $res_includes -fo $resource_output $file' />

-           <Option compiler="windows_sdk_x86" use="1" buildCommand='$rescomp -DST_OCX_TLB_PATH=&quot;$(TARGET_OBJECT_DIR)/StActiveX.idl.tlb&quot; $res_includes -fo $resource_output $file' />

-           <Option target="WIN_gcc_x86" />

+           <Option compiler="msvc10" use="1" buildCommand='$rescomp -DST_OCX_TLB_PATH=&quot;$(TARGET_OBJECT_DIR)/StActiveX.idl.tlb&quot; $res_includes -fo $resource_output $file' />

            <Option target="WIN_vc_x86" />

-           <Option target="WIN_vc_x86_DEBUG" />

+           <Option target="WIN_vc_AMD64_DEBUG" />

            <Option target="WIN_vc_AMD64" />

        </Unit>

-       <Unit filename="StBrowserPluginNPAPI.def">

-           <Option target="WIN_gcc_x86" />

-       </Unit>

        <Unit filename="npEntry.cpp" />

        <Unit filename="npapi.h" />

        <Unit filename="npfunctions.h" />

​

@@ -6,41 +6,6 @@

        <Option pch_mode="2" />

        <Option compiler="gcc" />

        <Build>

-           <Target title="WIN_gcc_x86">

-               <Option output="../bin/$(TARGET_NAME)/libStCADViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />

-               <Option object_output="obj/$(TARGET_NAME)/" />

-               <Option type="3" />

-               <Option compiler="gcc" />

-               <Option parameters="--in=StCADViewer" />

-               <Option host_application="../bin/$(TARGET_NAME)/sView" />

-               <Option run_host_application_in_terminal="0" />

-               <Option createStaticLib="1" />

-               <Compiler>

-                   <Add option="-O3" />

-                   <Add option="-std=c++0x" />

-                   <Add option="-Wall" />

-                   <Add option="-g" />

-                   <Add option="-shared" />

-                   <Add option="-mmmx" />

-                   <Add option="-msse" />

-                   <Add option="-DUNICODE" />

-                   <Add option="-DST_DEBUG" />

-                   <Add option="-DWNT" />

-                   <Add option="-DST_HAVE_STCONFIG" />

-               </Compiler>

-               <Linker>

-                   <Add library="opengl32" />

-                   <Add library="gdi32" />

-                   <Add library="Comdlg32" />

-                   <Add library="shell32" />

-                   <Add library="Wsock32" />

-                   <Add library="Version" />

-                   <Add directory="../3rdparty/OCCT/lib/WIN_vc_x86" />

-               </Linker>

-               <ExtraCommands>

-                   <Add before='cmd /c call ..\copy_res.bat $(TARGET_OUTPUT_DIR) $(TARGET_OUTPUT_BASENAME)' />

-               </ExtraCommands>

-           </Target>

            <Target title="WIN_vc_x86">

                <Option output="../bin/$(TARGET_NAME)/StCADViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />

                <Option object_output="obj/$(TARGET_NAME)/" />

@@ -77,11 +42,11 @@

                    <Add after='mt.exe /nologo /manifest &quot;$(TARGET_OUTPUT_FILE).manifest&quot; /outputresource:&quot;$(TARGET_OUTPUT_FILE)&quot;;2' />

                </ExtraCommands>

            </Target>

-           <Target title="WIN_vc_x86_DEBUG">

+           <Target title="WIN_vc_AMD64_DEBUG">

                <Option output="../bin/$(TARGET_NAME)/StCADViewer" imp_lib="../lib/$(TARGET_NAME)/$(TARGET_OUTPUT_BASENAME)" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME)" prefix_auto="1" extension_auto="1" />

                <Option object_output="obj/$(TARGET_NAME)/" />

                <Option type="3" />

-               <Option compiler="msvc10" />

+               <Option compiler="windows_sdk_x86_64" />

                <Option parameters="--in=StCADViewer" />

                <Option host_application="../bin/$(TARGET_NAME)/sView" />

                <Option run_host_application_in_terminal="0" />