diff --git a/CMakeLists.txt b/CMakeLists.txt index 267cd9388ac8473520540525d855b69840e2c878..19479f756921f80d94a8a09deb4433b8b3f6b517 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,15 +32,15 @@ if( ITA_CORE_LIBS_BUILD_STATIC ) endif( ) if( ITA_VISTA_BUILD_STATIC ) - add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC ) + add_definitions( -DVISTACORELIBS_STATIC ) + list( APPEND VISTA_USE_PACKAGE_LIBRARIES ws2_32 winspool ) endif( ) -if( BUILD_SHARED_LIBS ) - add_definitions( -DVAMATLAB_EXPORTS ) -else( ) +if( NOT BUILD_SHARED_LIBS ) add_definitions( -DVABASE_STATIC -DVANET_STATIC ) endif( ) + if( ITA_VA_MATLAB_BUILD_WITH_INTERNAL_CORE ) vista_use_package( VACore REQUIRED FIND_DEPENDENCIES ) add_definitions( -DVAMATLAB_INTERNAL_CORE ) @@ -64,7 +64,7 @@ set( VAMATLAB_SRC "src/VAMatlabTracking.h" "src/VAMatlabTracking.cpp" ) -add_library( VAMatlab ${VAMATLAB_SRC} VAMatlab.def ) +add_library( VAMatlab SHARED ${VAMATLAB_SRC} VAMatlab.def ) target_link_libraries( VAMatlab ${VISTA_USE_PACKAGE_LIBRARIES} ) if( ITA_VA_INSTALL_WITH_DLLS ) @@ -79,6 +79,12 @@ vista_create_cmake_configs( VAMatlab ) set_property( TARGET VAMatlab PROPERTY FOLDER "VA/Bindings" ) set_target_properties( VAMatlab PROPERTIES SUFFIX ".${MATLAB_MEX_EXTENSION}") +# Build Matlab class and move Matlab executable to bin folder (future work) +if( ITA_VA_MATLAB_POSTBUILD_CREATE_MATLAB_CLASS ) + set( MATLAB_BUILD_CLASS_COMMAND "matlab -nodisplay -nosplash -nodesktop -r \"run( 'matlab/itaVA_build_absolute.m' )\"" ) + add_custom_command( TARGET VAMatlab POST_BUILD COMMAND ${MATLAB_BUILD_CLASS_COMMAND} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMENT "Running matlab itaVA installer" VERBATIM ) +endif( ) + # VA matlab scripts file set( VAMATLAB_BASE_DIR "${CMAKE_INSTALL_PREFIX}" ) diff --git a/LICENSE.md b/LICENSE.md index 5689830f72de71aada5fa27fd266bd49cd0791ff..1e502a2bae44fd5b6bcb74007c511d261f580588 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University +Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University Licensed under the Apache License, Version 2.0 (the "License"); you may not use files of this project except in compliance with the License. diff --git a/README.md b/README.md index a5cd5e197319b81ae8a66eacf96831deea0f33f3..4f75aad9ae3ea5ee27446101c903753a742734c5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ VAMatlab is a binding to the VA interface for Matlab. It uses the VA network con ### License -Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University +Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University Licensed under the Apache License, Version 2.0 (the "License"); you may not use files of this project except in compliance with the License. diff --git a/src/VAMatlabConnection.cpp b/src/VAMatlabConnection.cpp index 6728d98c9d1c7dbe56bf4a7ca4cbbce926942b19..6fa9c36e2c537477a285246b9ce102794a40b76a 100644 --- a/src/VAMatlabConnection.cpp +++ b/src/VAMatlabConnection.cpp @@ -1,3 +1,16 @@ +/* + * -------------------------------------------------------------------------------------------- + * + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University + * + * -------------------------------------------------------------------------------------------- + */ + #include "VAMatlabConnection.h" #include "VAMatlabTracking.h" diff --git a/src/VAMatlabConnection.h b/src/VAMatlabConnection.h index 069abbf49dd1c1525c1dfb489f499ad410eb24a6..feb3b6c6ddeb640c2c1795b0ba051affdda9374b 100644 --- a/src/VAMatlabConnection.h +++ b/src/VAMatlabConnection.h @@ -1,18 +1,18 @@ /* + * -------------------------------------------------------------------------------------------- * - * VVV VVV A - * VVV VVV AAA Virtual Acoustics - * VVV VVV AAA Real-time auralisation for virtual reality - * VVV VVV AAA - * VVVVVV AAA (c) Copyright Institut für Technische Akustik (ITA) - * VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de) + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University * + * -------------------------------------------------------------------------------------------- */ - -// $Id: VAMatlabTracking.h 2403 2012-04-20 18:31:09Z fwefers $ -#ifndef INCLUDE_WATCHER_VA_MATLAB_CONNECTION -#define INCLUDE_WATCHER_VA_MATLAB_CONNECTION +#ifndef IW_VA_MATLAB_CONNECTION +#define IW_VA_MATLAB_CONNECTION // STL includes #include diff --git a/src/VAMatlabExecutable.cpp b/src/VAMatlabExecutable.cpp index 24d49804e7b4988035d39edbb54504fb277b5cfc..64d8a527c64f1dfc45d7709424d7f0e42b60084b 100644 --- a/src/VAMatlabExecutable.cpp +++ b/src/VAMatlabExecutable.cpp @@ -1,3 +1,16 @@ +/* + * -------------------------------------------------------------------------------------------- + * + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University + * + * -------------------------------------------------------------------------------------------- + */ + #include "VAMatlabFunctionMapping.h" #include "VAMatlabHelpers.h" #include "VAMatlabConnection.h" diff --git a/src/VAMatlabFunctionMapping.h b/src/VAMatlabFunctionMapping.h index 37d50c53a09b93b610f634ea5d42f917bf0264f2..f6fe6a3132ddb6ea6f66dbbf48e0365d4b4736dc 100644 --- a/src/VAMatlabFunctionMapping.h +++ b/src/VAMatlabFunctionMapping.h @@ -1,12 +1,12 @@ /* * -------------------------------------------------------------------------------------------- * - * VVV VVV A - * VVV VVV AAA Virtual Acoustics (VA) - * VVV VVV AAA Real-time auralisation for virtual reality - * VVV VVV AAA - * VVVVVV AAA (c) Copyright Institute of Technical Acoustics (ITA), 2015-2017 - * VVVV AAA RWTH Aachen University (http://www.akustik.rwth-aachen.de) + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University * * -------------------------------------------------------------------------------------------- */ diff --git a/src/VAMatlabHelpers.cpp b/src/VAMatlabHelpers.cpp index 2e98e9ddd9d5c8166d1d584644e8db74fe0bc0a9..f0f63746b36f8535358d317b61b1e612ccbea317 100644 --- a/src/VAMatlabHelpers.cpp +++ b/src/VAMatlabHelpers.cpp @@ -1,3 +1,16 @@ +/* + * -------------------------------------------------------------------------------------------- + * + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University + * + * -------------------------------------------------------------------------------------------- + */ + #include "VAMatlabHelpers.h" #include diff --git a/src/VAMatlabHelpers.h b/src/VAMatlabHelpers.h index f060aa1a1a3e4e298e751a9710e5d82bb2501a4d..d928d64a64842f20fdd57811ea003d9934f32aee 100644 --- a/src/VAMatlabHelpers.h +++ b/src/VAMatlabHelpers.h @@ -1,27 +1,18 @@ /* + * -------------------------------------------------------------------------------------------- * - * VVV VVV A - * VVV VVV AAA Virtual Acoustics - * VVV VVV AAA Real-time auralisation for virtual reality - * VVV VVV AAA - * VVVVVV AAA (c) Copyright Institut für Technische Akustik (ITA) - * VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de) + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University * - * --------------------------------------------------------------------------------- - * - * File: MatlabHelpers.h - * - * Purpose: Conversion and validation functions for Matlab data - * - * Authors: Frank Wefers (Frank.Wefers@akustik.rwth-aachen.de) - * - * --------------------------------------------------------------------------------- + * -------------------------------------------------------------------------------------------- */ - -// $Id: MatlabHelpers.h 2403 2012-04-20 18:31:09Z fwefers $ -#ifndef __HELPERS_H__ -#define __HELPERS_H__ +#ifndef IW_VA_MATLAB_HELPERS +#define IW_VA_MATLAB_HELPERS #include #include @@ -95,4 +86,4 @@ mxArray* matlabCreateSceneInfo(const CVASceneInfo& sci); mxArray* matlabCreateStruct( const CVAStruct& oStruct ); -#endif // __HELPERS_H__ +#endif // IW_VA_MATLAB_HELPERS diff --git a/src/VAMatlabTracking.cpp b/src/VAMatlabTracking.cpp index fbedaf1461e5a6fa7a08f4dcb65a67245c392d57..ea50ff021000ca17cbd9df4c85d3103620be31f0 100644 --- a/src/VAMatlabTracking.cpp +++ b/src/VAMatlabTracking.cpp @@ -1,3 +1,16 @@ +/* + * -------------------------------------------------------------------------------------------- + * + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University + * + * -------------------------------------------------------------------------------------------- + */ + #include "VAMatlabTracking.h" #include "VAMatlabConnection.h" diff --git a/src/VAMatlabTracking.h b/src/VAMatlabTracking.h index d763a7170bfe9b63fc2a9e26db5cc9544d28562a..6c65f8241a4ec00a7515cd11033a71d517b6a1ca 100644 --- a/src/VAMatlabTracking.h +++ b/src/VAMatlabTracking.h @@ -1,19 +1,18 @@ /* * -------------------------------------------------------------------------------------------- * - * VVV VVV A - * VVV VVV AAA Virtual Acoustics (VA) - * VVV VVV AAA Real-time auralisation for virtual reality - * VVV VVV AAA - * VVVVVV AAA (c) Copyright Institute of Technical Acoustics (ITA), 2015-2017 - * VVVV AAA RWTH Aachen University (http://www.akustik.rwth-aachen.de) + * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org + * VVV VVV AAA Licensed under the Apache License, Version 2.0 + * VVV VVV AAA + * VVV VVV AAA Copyright 2015-2017 + * VVVVVV AAA Institute of Technical Acoustics (ITA) + * VVVV AAA RWTH Aachen University * * -------------------------------------------------------------------------------------------- */ - -#ifndef INCLUDE_WATCHER_VA_MATLAB_TRACKING -#define INCLUDE_WATCHER_VA_MATLAB_TRACKING +#ifndef IW_VA_MATLAB_TRACKING +#define IW_VA_MATLAB_TRACKING // STL includes #include @@ -58,4 +57,4 @@ private: bool m_bConnected; }; -#endif // INCLUDE_WATCHER_VA_MATLAB_TRACKING +#endif // IW_VA_MATLAB_TRACKING