Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Openvibe Group
extras
Commits
6ba99bf6
Commit
6ba99bf6
authored
Apr 27, 2016
by
Jussi Lindgren
Browse files
Everything: Fixed compiler warnings on VS2013
- Also sets the current win build target as at least Vista
parent
fa66fc3d
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
6ba99bf6
...
...
@@ -41,7 +41,9 @@ IF(WIN32)
SET
(
OV_OMP_WAIT_POLICY
"PASSIVE"
)
# Disable /MP if you don't like VS using all the cores for compilation
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/wd4355 /MP
${
OV_EIGEN_FLAGS
}
"
)
ADD_DEFINITIONS
(
"-DNOMINMAX -DBOOST_ALL_NO_LIB"
)
ADD_DEFINITIONS
(
"-DNOMINMAX -DBOOST_ALL_NO_LIB"
)
# At least Windows Vista target - if you target Windows XP (0x0501), some components may not compile
ADD_DEFINITIONS
(
"-D_WIN32_WINNT=0x0600"
)
# Find out the compiler version, deps may use this
IF
(
${
CMAKE_MAJOR_VERSION
}
LESS 3
)
...
...
@@ -62,8 +64,11 @@ IF(WIN32)
ENDIF
(
${
CMAKE_MAJOR_VERSION
}
LESS 3
)
STRING
(
REGEX MATCH
"vc120.*"
MSVC_VER120
${
MSVC_SERVICE_PACK
}
)
IF
(
MSVC_VER120
)
# If OpenMP is available, using it will allow Eigen to use multiple cores in matrix math. Only on VS120,
# as VS100 allocates the cores too aggressively when OpenMP is on.
# Boost 1.55 asio causes several compiler warnings on VS2013 we cannot do much about. try removing the following when boost is upgraded.
ADD_DEFINITIONS
(
"-D_WINSOCK_DEPRECATED_NO_WARNINGS"
)
# If OpenMP is available, using it will allow Eigen to use multiple cores in matrix math. Only used on VS120,
# as VS100 allocates the cores too aggressively when OpenMP is enabled.
INCLUDE
(
"FindOpenMP"
)
IF
(
OPENMP_FOUND
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
OpenMP_CXX_FLAGS
}
"
)
...
...
cmake-modules/FindThirdPartyEemagineEEGO.cmake
View file @
6ba99bf6
...
...
@@ -25,7 +25,8 @@ IF(WIN32)
INCLUDE_DIRECTORIES
(
${
EEGOAPI_DIR
}
)
INSTALL
(
PROGRAMS
"
${
LIB_EEGOAPI
}
"
DESTINATION
"bin"
)
ADD_DEFINITIONS
(
-DTARGET_HAS_ThirdPartyEEGOAPI
)
ADD_DEFINITIONS
(
-DEEGO_SDK_BIND_DYNAMIC
)
MESSAGE
(
STATUS
" [ OK ] lib
${
LIB_EEGOAPI
}
"
)
ENDIF
(
WIN32
)
...
...
contrib/plugins/server-drivers/eemagine-eego/src/ovasCDriverEEGO.cpp
View file @
6ba99bf6
...
...
@@ -18,7 +18,6 @@
// The interface to the driver
// We have to setup the binding method and the unicode support first
#define EEGO_SDK_BIND_DYNAMIC
#define _UNICODE
#if defined(_MBCS) // Only unicode should be supported. Better stay away from MBCS methods!
#undef _MBCS
...
...
plugins/processing/network-io/src/box-algorithms/ovpCBoxAlgorithmSharedMemoryWriter.cpp
View file @
6ba99bf6
...
...
@@ -174,7 +174,8 @@ boolean CBoxAlgorithmSharedMemoryWriter::process(void)
{
for
(
uint32
si
=
0
;
si
<
l_pStimSet
->
getStimulationCount
();
si
++
)
{
m_vStimuliSet
[
l_ui32StimulusInputCounter
]
->
push_back
(
l_pStimSet
->
getStimulationIdentifier
(
si
));
// @fixme m_vStimuliSet defined as 32bit will only work correctly with stimuli that fit in 32bits (OV stimulations can be 64bit)
m_vStimuliSet
[
l_ui32StimulusInputCounter
]
->
push_back
(
static_cast
<
uint32
>
(
l_pStimSet
->
getStimulationIdentifier
(
si
)));
this
->
getLogManager
()
<<
LogLevel_Info
<<
"Added stimulus with id "
<<
m_vStimuliSet
[
l_ui32StimulusInputCounter
]
->
back
()
<<
" to shared memory variable
\n
"
;
}
l_rDynamicBoxContext
.
markInputAsDeprecated
(
j
,
i
);
...
...
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