diff --git a/StBrowserPlugin/StBrowserPlugin.cbp b/StBrowserPlugin/StBrowserPlugin.cbp deleted file mode 100644 index 737abb66..00000000 --- a/StBrowserPlugin/StBrowserPlugin.cbp +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - diff --git a/StCADViewer.workspace b/StCADViewer.workspace deleted file mode 100644 index 651d9844..00000000 --- a/StCADViewer.workspace +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/StCADViewer/StCADViewer.cbp b/StCADViewer/StCADViewer.cbp deleted file mode 100644 index 1429eba8..00000000 --- a/StCADViewer/StCADViewer.cbp +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - diff --git a/StCore/StCore.cbp b/StCore/StCore.cbp deleted file mode 100644 index 6491ce66..00000000 --- a/StCore/StCore.cbp +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - diff --git a/StDiagnostics/StDiagnostics.cbp b/StDiagnostics/StDiagnostics.cbp deleted file mode 100644 index 1088d106..00000000 --- a/StDiagnostics/StDiagnostics.cbp +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - diff --git a/StGLWidgets/StGLWidgets.cbp b/StGLWidgets/StGLWidgets.cbp deleted file mode 100644 index 0dcca8dd..00000000 --- a/StGLWidgets/StGLWidgets.cbp +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - diff --git a/StImageViewer/StImageViewer.cbp b/StImageViewer/StImageViewer.cbp deleted file mode 100644 index 45c2e877..00000000 --- a/StImageViewer/StImageViewer.cbp +++ /dev/null @@ -1,289 +0,0 @@ - - - - - - diff --git a/StMonitorsDump/StMonitorsDump.cbp b/StMonitorsDump/StMonitorsDump.cbp deleted file mode 100644 index ccb32bbd..00000000 --- a/StMonitorsDump/StMonitorsDump.cbp +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - diff --git a/StMoviePlayer/StMoviePlayer.cbp b/StMoviePlayer/StMoviePlayer.cbp deleted file mode 100644 index 960453a5..00000000 --- a/StMoviePlayer/StMoviePlayer.cbp +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - diff --git a/StOutAnaglyph/StOutAnaglyph.cbp b/StOutAnaglyph/StOutAnaglyph.cbp deleted file mode 100644 index b5b1bf62..00000000 --- a/StOutAnaglyph/StOutAnaglyph.cbp +++ /dev/null @@ -1,286 +0,0 @@ - - - - - - diff --git a/StOutDistorted/StOutDistorted.cbp b/StOutDistorted/StOutDistorted.cbp deleted file mode 100644 index 804d289e..00000000 --- a/StOutDistorted/StOutDistorted.cbp +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - diff --git a/StOutDual/StOutDual.cbp b/StOutDual/StOutDual.cbp deleted file mode 100644 index a825ba9c..00000000 --- a/StOutDual/StOutDual.cbp +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - diff --git a/StOutIZ3D/StOutIZ3D.cbp b/StOutIZ3D/StOutIZ3D.cbp deleted file mode 100644 index 07883839..00000000 --- a/StOutIZ3D/StOutIZ3D.cbp +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - diff --git a/StOutInterlace/StOutInterlace.cbp b/StOutInterlace/StOutInterlace.cbp deleted file mode 100644 index f8d3f79d..00000000 --- a/StOutInterlace/StOutInterlace.cbp +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - diff --git a/StOutPageFlip/StOutPageFlip.cbp b/StOutPageFlip/StOutPageFlip.cbp deleted file mode 100644 index e4f385a1..00000000 --- a/StOutPageFlip/StOutPageFlip.cbp +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - diff --git a/StShared/StShared.cbp b/StShared/StShared.cbp deleted file mode 100644 index d9aff9ee..00000000 --- a/StShared/StShared.cbp +++ /dev/null @@ -1,537 +0,0 @@ - - - - - - diff --git a/StTests/StTests.cbp b/StTests/StTests.cbp deleted file mode 100644 index 6ab46898..00000000 --- a/StTests/StTests.cbp +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - diff --git a/distribution/build.sh b/distribution/build.sh deleted file mode 100755 index 865064ca..00000000 --- a/distribution/build.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -# This script perform compilation of sView. -# -# Copyright © Kirill Gavrilov, 2010-2013 - -# go to the script directory -aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD"; - -releaseStatus="ST_RELEASE" - -for i in $* -do - if [ "$i" == "ST_RELEASE" ]; then - releaseStatus="ST_RELEASE"; - elif [ "$i" == "ST_ALPHA" ]; then - releaseStatus="ST_ALPHA" - elif [ "$i" == "ST_RELEASE_CANDIDATE" ]; then - releaseStatus="ST_RELEASE_CANDIDATE" - fi -done - -# detect architecture -aSystem=`uname -s` -anArch=`uname -m` -if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then - anArch=i386 -else - anArch=amd64 -fi - -buildRoot=temp/sView-$aSystem-$anArch - -# make backup of default config file -mv -f ../include/stconfig.conf ../include/stconfig.conf.buildbak - -SVIEW_BUILD_CONF=../include/stconfig.conf - -echo Build configuration: -echo Target="$aSystem gcc $anArch" - -# START creating config file -if [ "$releaseStatus" == "RELEASE" ]; then - echo Timebomb=OFF - aTimeBombDefine="" -else - echo Timebomb=ON - aTimeBombDefine=$(cat << EOF -#ifndef ST_TIMEBOMB - #define ST_TIMEBOMB -#endif -EOF -) -fi - -cat > $SVIEW_BUILD_CONF << EOF -#ifndef __stConfig_conf_ -#define __stConfig_conf_ - -$aTimeBombDefine - -#ifndef SVIEW_SDK_VER_STATUS - #define SVIEW_SDK_VER_STATUS $releaseStatus -#endif - -#ifndef SVIEW_SDK_VERSION_AUTO - #define SVIEW_SDK_VERSION_AUTO -#endif - -#endif //__stConfig_conf_ - -EOF -# END creating config file - -aConfig="LINUX_gcc" -aCodeBlocksCmd="codeblocks" -if [ "$aSystem" == "Darwin" ]; then - aConfig="MAC_gcc" - aCodeBlocksCmd="/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" -fi - -mkdir -p "${HOME}/.codeblocks" -cp -f "${aScriptPath}/codeblocks/min_gcc.conf" "${HOME}/.codeblocks/" - -mkdir -p "${aScriptPath}/../bin/$aConfig" - -# start virtual X-server for C::B GUI -hasXvfb=`which Xvfb` -if [ -x "${hasXvfb}" ]; then - Xvfb :20 -screen 0 640x480x24 & - aXvfbPid=$! - anOldDisplay=$DISPLAY - export DISPLAY=:20 -fi; - -# perform sView rebuild -$aCodeBlocksCmd --no-splash-screen --profile="min_gcc" --rebuild --target="$aConfig" \ - ../workspace.workspace \ - &>"${aScriptPath}/../bin/$aConfig/build.log" - -if [ -x "${hasXvfb}" ]; then - kill $aXvfbPid - export DISPLAY=$anOldDisplay -fi; - -# move default config file back -mv -f ../include/stconfig.conf.buildbak ../include/stconfig.conf diff --git a/distribution/codeblocks/min_gcc.conf b/distribution/codeblocks/min_gcc.conf deleted file mode 100644 index 53f3a6c1..00000000 --- a/distribution/codeblocks/min_gcc.conf +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 2810bdbf..bf579ad5 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -2,7 +2,6 @@ sView requires several 3rd-party components for building: * C/C++ compiler (g++, MSVC 2010+) -* Code::Blocks (https://www.codeblocks.org/) * FFmpeg (https://www.ffmpeg.org) * OpenAL soft (https://openal-soft.org/) * GTK2+, Linux only (https://www.gtk.org) @@ -19,8 +18,7 @@ sudo apt-get install \ libgl-dev \ libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswscale-dev \ libconfig++-dev libconfig-dev \ - libxpm-dev \ - codeblocks + libxpm-dev ~~~~~ The similar command for RPM-based distributives: @@ -72,36 +70,11 @@ The building can be run on a Linux host with compatible Java SDK, Android NDK an *distribution/qmake/sView.pro* defines a project file for Qt Creator. This is not a self-sustained solution, but rather a wrapper over existing UNIX `Makefile`, allowing to develop and build sView for macOS, Linux and Android targets within IDE. -It has been introduced as an alternative to Code::Blocks having severe stability and usability problem on many platforms. - -## III. Code::Blocks - -For historical reasons, sView building environment was initially defined by a Code::Blocks (https://www.codeblocks.org/) workspace, allowing to develop and build application on multiple platforms. -Code::Blocks remains the main way for building sView on Windows platform, although development can be done using Visual Studio (see below). - -There are several building targets depending on platform -(macOS, Linux, Windows) and debugging possibilities: -* `WIN_vc_x86`, 32-bit target using Visual Studio compiler -* `WIN_vc_AMD64_DEBUG`,64-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`, macOS target, g++ compatible compiler -* `MAC_gcc_DEBUG`, macOS 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. CMake sView comes within CMake scripts, compatible with Visual Studio 2015 and higher. -Notice that for historical and compatibility reasons, sView install packages for Windows are build using Code::Blocks, configured to Visual Studio 2010 compiler. - ## V. Building options Several preprocessor directives control building options. @@ -117,10 +90,9 @@ Notice that by default "include/stconfig.conf" file is used to override these op 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. +* `build.bat`, batch script for Windows. Performs re-building of x86 and x86_64 targets + using Visual Studio and pack result binaries using InnoSetup script. + Notice that all dependencies should be available (including InnoSetup). * `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/" diff --git a/sViewGallery/sViewGallery.cbp b/sViewGallery/sViewGallery.cbp deleted file mode 100644 index 2d42e6d8..00000000 --- a/sViewGallery/sViewGallery.cbp +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/sview/sview.cbp b/sview/sview.cbp deleted file mode 100644 index c31f9fd0..00000000 --- a/sview/sview.cbp +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - diff --git a/workspace.workspace b/workspace.workspace deleted file mode 100644 index b414a642..00000000 --- a/workspace.workspace +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -