Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
VABase
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
VABase
Commits
373b3535
Commit
373b3535
authored
Sep 30, 2016
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding vista static build switch
parent
9ba1a7a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
25 deletions
+39
-25
CMakeLists.txt
CMakeLists.txt
+15
-1
include/VABaseDefinitions.h
include/VABaseDefinitions.h
+24
-24
No files found.
CMakeLists.txt
View file @
373b3535
...
...
@@ -12,11 +12,14 @@ if( NOT DEFINED ITA_VA_BUILD_STATIC )
set
(
ITA_VA_BUILD_STATIC OFF CACHE BOOL
"Build static VA libs"
)
endif
(
NOT DEFINED ITA_VA_BUILD_STATIC
)
if
(
NOT DEFINED ITA_VABASE_INSTALL_WITH_DLLS
)
set
(
ITA_VABASE_INSTALL_WITH_DLLS ON CACHE BOOL
"Install VABase with depending DLLs (use this switch with care)"
)
endif
(
NOT DEFINED ITA_VABASE_INSTALL_WITH_DLLS
)
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
)
vista_use_package
(
VistaCoreLibs REQUIRED COMPONENTS VistaInterProcComm
)
...
...
@@ -31,11 +34,22 @@ if( NOT ITA_VA_BUILD_STATIC )
add_definitions
(
-DVABASE_EXPORT
)
else
(
NOT ITA_VA_BUILD_STATIC
)
add_definitions
(
-VABASE_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_VA_BUILD_STATIC
)
if
(
ITA_VISTA_BUILD_STATIC
)
add_definitions
(
-DVISTAINTERPROCCOMM_STATIC
)
endif
(
ITA_VISTA_BUILD_STATIC
)
add_library
(
VABase
"
${
ProjectSources
}
"
)
target_link_libraries
(
VABase
${
VISTA_USE_PACKAGE_LIBRARIES
}
)
set
(
BUILD_SHARED_LIBS
${
BUILD_SHARED_LIBS_TEMP
}
)
# configure
vista_configure_lib
(
VABase
)
...
...
include/VABaseDefinitions.h
View file @
373b3535
...
...
@@ -76,24 +76,24 @@ public:
};
};
VAVec3
()
:
x
(
0
),
y
(
0
),
z
(
0
)
{};
VAVec3
(
const
VAVec3
&
v
)
:
x
(
v
.
x
),
y
(
v
.
y
),
z
(
v
.
z
)
{};
VAVec3
(
double
x
,
double
y
,
double
z
)
:
x
(
x
),
y
(
y
),
z
(
z
)
{};
virtual
~
VAVec3
()
{};
inline
VAVec3
()
:
x
(
0
),
y
(
0
),
z
(
0
)
{};
inline
VAVec3
(
const
VAVec3
&
v
)
:
x
(
v
.
x
),
y
(
v
.
y
),
z
(
v
.
z
)
{};
inline
VAVec3
(
double
x
,
double
y
,
double
z
)
:
x
(
x
),
y
(
y
),
z
(
z
)
{};
inline
virtual
~
VAVec3
()
{};
virtual
double
Length
()
const
inline
virtual
double
Length
()
const
{
return
sqrt
(
x
*
x
+
y
*
y
+
z
*
z
);
};
virtual
void
Set
(
double
x_
,
double
y_
,
double
z_
)
inline
virtual
void
Set
(
double
x_
,
double
y_
,
double
z_
)
{
x
=
x_
;
y
=
y_
;
z
=
z_
;
};
VAVec3
Cross
(
const
VAVec3
&
vCrossProduct
)
const
inline
VAVec3
Cross
(
const
VAVec3
&
vCrossProduct
)
const
{
VAVec3
vCrossResult
;
vCrossResult
.
x
=
y
*
vCrossProduct
.
z
-
z
*
vCrossProduct
.
y
;
...
...
@@ -102,12 +102,12 @@ public:
return
vCrossResult
;
};
double
Dot
(
const
VAVec3
&
vDotProduct
)
const
inline
double
Dot
(
const
VAVec3
&
vDotProduct
)
const
{
return
(
x
*
vDotProduct
.
x
+
y
*
vDotProduct
.
y
+
z
*
vDotProduct
.
z
);
};
void
Norm
()
inline
void
Norm
()
{
const
double
l
=
Length
();
x
/=
l
;
...
...
@@ -169,11 +169,11 @@ public:
double
roll
;
//!< Right-hand rotation around negative Z-axis
VAOrientYPR
()
:
yaw
(
0
),
pitch
(
0
),
roll
(
0
)
{};
VAOrientYPR
(
double
yaw
,
double
pitch
,
double
roll
)
:
yaw
(
yaw
),
pitch
(
pitch
),
roll
(
roll
)
{};
virtual
~
VAOrientYPR
()
{};
inline
VAOrientYPR
()
:
yaw
(
0
),
pitch
(
0
),
roll
(
0
)
{};
inline
VAOrientYPR
(
double
yaw
,
double
pitch
,
double
roll
)
:
yaw
(
yaw
),
pitch
(
pitch
),
roll
(
roll
)
{};
inline
virtual
~
VAOrientYPR
()
{};
virtual
void
Set
(
double
yaw_deg
,
double
pitch_deg
,
double
roll_deg
)
inline
virtual
void
Set
(
double
yaw_deg
,
double
pitch_deg
,
double
roll_deg
)
{
yaw
=
yaw_deg
;
pitch
=
pitch_deg
;
...
...
@@ -218,7 +218,7 @@ public:
std
::
string
sSubaction
;
//!< Currently performed sub action
//! Constructor
CVAProgress
()
:
iCurrentStep
(
0
),
iMaxStep
(
0
)
{};
inline
CVAProgress
()
:
iCurrentStep
(
0
),
iMaxStep
(
0
)
{};
};
...
...
@@ -238,7 +238,7 @@ public:
* \param sTheName Name string of the integer literal, i.e. 'VA_AURAMOD_DEFAULT'
* \param iTheValue Value of the integer
*/
CVAIntLiteral
(
const
std
::
string
&
sTheScope
,
inline
CVAIntLiteral
(
const
std
::
string
&
sTheScope
,
const
std
::
string
&
sTheName
,
int
iTheValue
)
:
sScope
(
sTheScope
),
sName
(
sTheName
),
iValue
(
iTheValue
)
{}
...
...
@@ -272,7 +272,7 @@ public:
// TODO: Auflsung usw.
//! Default constructor
CVADirectivityInfo
()
:
iID
(
-
1
),
iReferences
(
0
)
{};
inline
CVADirectivityInfo
()
:
iID
(
-
1
),
iReferences
(
0
)
{};
//! Initializing constructor
/**
...
...
@@ -282,7 +282,7 @@ public:
* \param sDesc Brief description of the directivity
* \param iReferences Usage reference count of directivity data
*/
CVADirectivityInfo
(
int
iID
,
inline
CVADirectivityInfo
(
int
iID
,
const
std
::
string
&
sName
,
const
std
::
string
&
sFilename
,
const
std
::
string
&
sDesc
,
...
...
@@ -311,7 +311,7 @@ public:
// TODO: More fields?
//! Default constructor
CVAHRIRInfo
()
:
iID
(
-
1
),
iReferences
(
0
)
{};
inline
CVAHRIRInfo
()
:
iID
(
-
1
),
iReferences
(
0
)
{};
//! Initializing constructor
/**
...
...
@@ -321,7 +321,7 @@ public:
* \param sDesc Brief description of the HRIR
* \param iReferences Usage reference count of HRIR data
*/
CVAHRIRInfo
(
int
iID
,
inline
CVAHRIRInfo
(
int
iID
,
const
std
::
string
&
sName
,
const
std
::
string
&
sFilename
,
const
std
::
string
&
sDesc
,
...
...
@@ -346,7 +346,7 @@ public:
double
dDuration
;
//!< Duration [s]
//! Default constructor
CVASoundInfo
()
:
iID
(
-
1
),
iLength
(
0
),
dDuration
(
0
)
{};
inline
CVASoundInfo
()
:
iID
(
-
1
),
iLength
(
0
),
dDuration
(
0
)
{};
//! Initializing constructor
/**
...
...
@@ -356,7 +356,7 @@ public:
* \param iLength Length of track in samples
* \param dDuration Duration of track in seconds
*/
CVASoundInfo
(
int
iID
,
inline
CVASoundInfo
(
int
iID
,
const
std
::
string
&
sName
,
const
std
::
string
&
sFilename
,
int
iLength
,
...
...
@@ -383,7 +383,7 @@ public:
int
iReferences
;
//!< Reference counter
//! Default constructor
CVASignalSourceInfo
()
:
iReferences
(
0
)
{};
inline
CVASignalSourceInfo
()
:
iReferences
(
0
)
{};
//! Initializing constructor
/**
...
...
@@ -394,7 +394,7 @@ public:
* \param sState State description of signal source info
* \param iReference Usage reference counter
*/
CVASignalSourceInfo
(
const
std
::
string
&
sID
,
inline
CVASignalSourceInfo
(
const
std
::
string
&
sID
,
const
std
::
string
&
sType
,
const
std
::
string
&
sName
,
const
std
::
string
&
sDesc
,
...
...
@@ -441,7 +441,7 @@ public:
bool
bSyncMod
;
//! Destructor
virtual
~
CVAAudiostreamState
()
{};
inline
virtual
~
CVAAudiostreamState
()
{};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment