Skip to content

Commit b4442c8

Browse files
IunusovIunusov
committed
Travis CI
1 parent 537186e commit b4442c8

File tree

9 files changed

+59
-60
lines changed

9 files changed

+59
-60
lines changed

‎!!make_project!!.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
if not exist deps/VST_SDK_2.4 (
3+
if not exist deps/vst_sdk_2.4 (
44
cd deps
55
call sync
66
cd ..

‎.travis.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
language: cpp
2+
3+
notifications:
4+
email: false
5+
6+
sudo: required
7+
8+
os:
9+
- linux
10+
#- osx
11+
12+
branches:
13+
only:
14+
- master
15+
16+
addons:
17+
apt:
18+
sources:
19+
- ubuntu-toolchain-r-test
20+
packages:
21+
- gcc-4.8
22+
- g++-4.8
23+
24+
before_install:
25+
- if [[ $TRAVIS_OS_NAME == linux ]]; then LINUX=true; fi
26+
- if [[ $TRAVIS_OS_NAME == osx ]]; then OSX=true; fi
27+
- if [[ $OSX ]]; then brew update; fi
28+
29+
install:
30+
- sudo apt-get -qq update
31+
- sudo apt-get install libx11-dev
32+
- wget https://www.cmake.org/files/v3.6/cmake-3.6.1-Linux-x86_64.sh
33+
- sudo sh cmake-3.6.1-Linux-x86_64.sh --skip-license --prefix=/usr
34+
- if [[ $LINUX && "$CXX" = "g++" ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
35+
- cd deps
36+
- ./sync.sh
37+
- cd ..
38+
script:
39+
- mkdir build
40+
- cd build
41+
- cmake ..
42+
- make -j3 -k
43+
- make

‎CMake/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
project (ShoutVST)
1+
project (ShoutVST CXX)
22

33
set (CMAKE_CXX_STANDARD 11)
44
set(CMAKE_CXX_STANDARD_REQUIRED ON)
55

6+
IF(CMAKE_COMPILER_IS_GNUCXX)
7+
set(MYFLAGS "-std=c++11 -Wall -Wextra -Wconversion -pedantic")
8+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYFLAGS}")
9+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MYFLAGS}")
10+
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
11+
612
set(LIBRARY_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ShoutVST_DLL")
713

814
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/..)

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ if((${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC))
1717
endif()
1818
endif()
1919

20-
IF(CMAKE_COMPILER_IS_GNUCC)
20+
IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
2121
set(MYFLAGS "-Ofast -Wl,--no-undefined")
2222
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MYFLAGS}")
2323
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYFLAGS}")
2424
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${MYFLAGS}")
2525
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MYFLAGS}")
26-
ENDIF(CMAKE_COMPILER_IS_GNUCC)
26+
ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
2727

2828
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/comp_definitions.h.in ${CMAKE_CURRENT_BINARY_DIR}/comp_definitions.h @ONLY)
2929
include_directories (${CMAKE_CURRENT_BINARY_DIR})

‎ShoutVST.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <atomic>
99
#include <memory>
10+
#include <mutex>
1011

1112
using std::recursive_mutex;
1213

‎deps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project (deps)
22
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libmp3lame-CMAKE)
33
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/OGG-Vorbis-CMAKE)
44
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libshout-CMAKE)
5-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/VST_SDK_2.4)
5+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vst_sdk_2.4)
66

77
SET(OPTION_BUILD_EXAMPLES OFF CACHE BOOL "FLTK: Builds the many fine example programs.")
88
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/FLTK)

‎deps/sync.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ if not exist FLTK (
2929
)
3030

3131
echo VST_SDK_2.4...
32-
if not exist VST_SDK_2.4 (
33-
(git clone https://github.com/Iunusov/VST_SDK_2.4.git)
32+
if not exist vst_sdk_2.4 (
33+
(git clone https://r-tur@bitbucket.org/r-tur/vst_sdk_2.4.git)
3434
) else (
35-
(cd VST_SDK_2.4) && (git pull) && (cd ..)
35+
(cd vst_sdk_2.4) && (git pull) && (cd ..)
3636
)
3737

3838

‎deps/sync.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ https://github.com/Iunusov/libmp3lame-CMAKE.git \
66
https://github.com/Iunusov/OGG-Vorbis-CMAKE.git \
77
https://github.com/Iunusov/libshout-CMAKE.git \
88
https://github.com/IngwiePhoenix/FLTK.git \
9-
https://github.com/Iunusov/VST_SDK_2.4.git
9+
https://[email protected]/r-tur/vst_sdk_2.4.git
1010
do
1111
filename="$(basename "$i")"
1212
dir="${filename%.*}"

‎main.cpp

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,5 @@
1-
//------------------------------------------------------------------------
2-
// Project : VST SDK
3-
// Version : 2.4
4-
//
5-
// Category : VST 2.x Classes
6-
// Filename : public.sdk/source/vst2.x/vstplugmain.cpp
7-
// Created by : Steinberg, 01/2004
8-
// Description : VST Plug-In Main Entry
9-
//
10-
//-----------------------------------------------------------------------------
11-
// LICENSE
12-
// (c) 2013, Steinberg Media Technologies GmbH, All Rights Reserved
13-
//-----------------------------------------------------------------------------
14-
// This Software Development Kit may not be distributed in parts or its entirety
15-
// without prior written agreement by Steinberg Media Technologies GmbH.
16-
// This SDK must not be used to re-engineer or manipulate any technology used
17-
// in any Steinberg or Third-party application or software module,
18-
// unless permitted by law.
19-
// Neither the name of the Steinberg Media Technologies nor the names of its
20-
// contributors may be used to endorse or promote products derived from this
21-
// software without specific prior written permission.
22-
//
23-
// THIS SDK IS PROVIDED BY STEINBERG MEDIA TECHNOLOGIES GMBH "AS IS" AND
24-
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
25-
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
26-
// DISCLAIMED.
27-
// IN NO EVENT SHALL STEINBERG MEDIA TECHNOLOGIES GMBH BE LIABLE FOR ANY DIRECT,
28-
// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29-
// (INCLUDING,
30-
// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
31-
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
32-
// OF
33-
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
34-
// NEGLIGENCE
35-
// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
36-
// ADVISED
37-
// OF THE POSSIBILITY OF SUCH DAMAGE.
38-
//----------------------------------------------------------------------------------
39-
401
#include "audioeffect.h"
412

42-
//------------------------------------------------------------------------
43-
/** Must be implemented externally. */
443
extern AudioEffect* createEffectInstance(audioMasterCallback audioMaster);
454

465
extern "C" {
@@ -52,22 +11,15 @@ extern "C" {
5211
#define VST_EXPORT
5312
#endif
5413

55-
//------------------------------------------------------------------------
56-
/** Prototype of the export function main */
57-
//------------------------------------------------------------------------
5814
VST_EXPORT AEffect* VSTPluginMain(audioMasterCallback audioMaster) {
59-
// Get VST Version of the Host
6015
if (!audioMaster(0, audioMasterVersion, 0, 0, 0, 0)) return 0; // old version
6116

62-
// Create the AudioEffect
6317
AudioEffect* effect = createEffectInstance(audioMaster);
6418
if (!effect) return 0;
6519

66-
// Return the VST AEffect structur
6720
return effect->getAeffect();
6821
}
6922

70-
// support for old hosts not looking for VSTPluginMain
7123
#if (TARGET_API_MAC_CARBON && __ppc__)
7224
VST_EXPORT AEffect* main_macho(audioMasterCallback audioMaster) {
7325
return VSTPluginMain(audioMaster);
@@ -90,9 +42,6 @@ VST_EXPORT AEffect* main_plugin(audioMasterCallback audioMaster) {
9042
void* hInstance;
9143

9244
extern "C" {
93-
//------------------------------------------------------------------------
94-
/** Prototype of the export function main */
95-
//------------------------------------------------------------------------
9645
VST_EXPORT __declspec(dllexport) int main(audioMasterCallback audioMaster) {
9746
// Get VST Version
9847
if (!audioMaster(0, audioMasterVersion, 0, 0, 0, 0)) return 0; // old version

0 commit comments

Comments
 (0)