Merge branch 'develop'

.gitignore

+HTML
+*.bat
+*.mat
+*.pdf
+*.dll
+*.exe
+*.so*
+Thumbs.db
+.DS_Store
+*.asv
+*.wav
+*.xlsx
+*.docx
+*.dll
+*.csv
+*.h5
+*.ita
+*.fig
+*.png
+*.jpeg
+*.sofa
+*.spk
+*.unv
+*.stl
+svnaccess
+*.lib
+*.exp

CMakeLists.txt

@@ -10,14 +10,6 @@ vista_use_package( ITABase REQUIRED FIND_DEPENDENCIES )
 vista_use_package( ITADataSources REQUIRED FIND_DEPENDENCIES )
 
 
-if( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
-	set( ITA_CORE_LIBS_BUILD_STATIC OFF CACHE BOOL "Build all ITA core libs in static mode" )
-endif( NOT DEFINED ITA_CORE_LIBS_BUILD_STATIC )
-
-if( NOT DEFINED ITA_VISTA_BUILD_STATIC )
-	set( ITA_VISTA_BUILD_STATIC OFF CACHE BOOL "Build against static ViSTA libraries" )
-endif( NOT DEFINED ITA_VISTA_BUILD_STATIC )
-
 # includes
 include_directories( "include" )
 
@@ -51,27 +43,21 @@ set( ITASamplerSources
 
 
 # compiler settings
-if( NOT ITA_CORE_LIBS_BUILD_STATIC )
-	add_definitions( -DITA_SAMPLER_EXPORT )
-else( NOT ITA_CORE_LIBS_BUILD_STATIC )
-	add_definitions( -DITA_BASE_STATIC -ITA_DATA_SOURCES_STATIC -DITA_SAMPLER_STATIC )
-	set( BUILD_SHARED_LIBS_TEMP ${BUILD_SHARED_LIBS} )
-	if( BUILD_SHARED_LIBS )
-		set( BUILD_SHARED_LIBS OFF )
-		message( "Ignoring activated BUILD_SHARED_LIBS temporary because static ITA core libs requested" )
-	endif( BUILD_SHARED_LIBS )
-endif( NOT ITA_CORE_LIBS_BUILD_STATIC )
 if( ITA_VISTA_BUILD_STATIC )
 	add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC )
-endif( ITA_VISTA_BUILD_STATIC )
+endif( )
+
+if( BUILD_SHARED_LIBS )
+	add_definitions( -DITA_SAMPLER_EXPORT )
+else( )
+	add_definitions( -DITA_SAMPLER_STATIC -DITA_CTC_STATIC -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC )
+endif( )
 
 
 # linker
 add_library( ITASampler ${ITASamplerHeader} ${ITASamplerSources} )
 target_link_libraries( ITASampler ${VISTA_USE_PACKAGE_LIBRARIES} )
 
-set( BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_TEMP} )
-
 
 # config
 vista_configure_lib( ITASampler )
@@ -84,5 +70,7 @@ set_property( TARGET ITASampler PROPERTY FOLDER "ITACoreLibs" )
 
 	
 # tests
+if( ITA_CORE_LIBS_WITH_TESTS )
 	set( ITASAMPLER_COMMON_BUILD TRUE )
 	add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/tests" )
+endif( )

LICENSE.md

-Copyright 2015-2016 Institute of Technical Acoustics, RWTH Aachen University. Any usage and distribution is prohibited, unless explicitly granted by the authors.
+Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University. Any usage and distribution is prohibited, unless explicitly granted by the authors.
\ No newline at end of file

include/ITASampleClock.h

@@ -3,7 +3,7 @@
 *
 *		ITA core libs
 *		(c) Copyright Institute of Technical Acoustics (ITA)
-*		RWTH Aachen University, Germany, 2015-2016
+*		RWTH Aachen University, Germany, 2015-2017
 *
 * ----------------------------------------------------------------
 *				    ____  __________  _______

include/ITASamplerDefinition.h

@@ -3,7 +3,7 @@
  *
  *		ITA core libs
  *		(c) Copyright Institute of Technical Acoustics (ITA)
- *		RWTH Aachen University, Germany, 2015-2016
+ *		RWTH Aachen University, Germany, 2015-2017
  *
  * ----------------------------------------------------------------
  *				    ____  __________  _______

include/ITASoundSample.h

@@ -3,7 +3,7 @@
 *
 *		ITA core libs
 *		(c) Copyright Institute of Technical Acoustics (ITA)
-*		RWTH Aachen University, Germany, 2015-2016
+*		RWTH Aachen University, Germany, 2015-2017
 *
 * ----------------------------------------------------------------
 *				    ____  __________  _______

include/ITASoundSamplePool.h

@@ -3,7 +3,7 @@
 *
 *		ITA core libs
 *		(c) Copyright Institute of Technical Acoustics (ITA)
-*		RWTH Aachen University, Germany, 2015-2016
+*		RWTH Aachen University, Germany, 2015-2017
 *
 * ----------------------------------------------------------------
 *				    ____  __________  _______

include/ITASoundSampler.h

@@ -3,7 +3,7 @@
 *
 *		ITA core libs
 *		(c) Copyright Institute of Technical Acoustics (ITA)
-*		RWTH Aachen University, Germany, 2015-2016
+*		RWTH Aachen University, Germany, 2015-2017
 *
 * ----------------------------------------------------------------
 *				    ____  __________  _______

tests/CMakeLists.txt

 cmake_minimum_required( VERSION 2.8 )
 
-if( NOT ITASampler_COMMON_BUILD )
-
 project( ITASamplerTest )
 list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 include( VistaCommon )
 
-endif()
 
 vista_use_package( ITABase REQUIRED FIND_DEPENDENCIES )
 vista_use_package( ITASampler REQUIRED FIND_DEPENDENCIES )
@@ -15,9 +12,9 @@ vista_use_package( OpenDAFF QUIET )
 
 
 add_definitions( -DIEEE754_64FLOAT=1 )
-if( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC )
+if( ITA_CORE_LIBS_BUILD_STATIC )
 	add_definitions( -DITA_BASE_STATIC -DITA_SAMPLER_STATIC -DITA_DATA_SOURCES_STATIC )
-endif( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC  )
+endif( )
 
 
 add_executable( DrumsOnKeyboard DrumsOnKeyboard.cpp )
@@ -38,7 +35,7 @@ if( VOPENDAFF_FOUND )
 	vista_create_default_info_file( RainyDay )
 
 	set_property( TARGET RainyDay PROPERTY FOLDER "ITACoreLibs/Tests/ITASampler" )
-endif( VOPENDAFF_FOUND )
+endif( )
 
 add_executable( Tests Tests.cpp )
 target_link_libraries( Tests ${VISTA_USE_PACKAGE_LIBRARIES} )