Commit 4ec56f5f authored by Jussi Lindgren's avatar Jussi Lindgren

Merge branch 'wip-thga-ov_path_bin-fix' of gitlab.inria.fr:openvibe/extras...

Merge branch 'wip-thga-ov_path_bin-fix' of gitlab.inria.fr:openvibe/extras into wip-all-openvibe20-base
parents 32b1cb51 e1c9668c
......@@ -72,7 +72,7 @@ if %To%==false (
goto:EOF
)
set "ScenarioFolder=%OV_PATH_DATA%\scenarios\convert\"
set "ScenarioFolder=%OV_PATH_ROOT%\share\openvibe\scenarios\convert\"
set "ScenarioToOpen=%Extension%2%DestinationExtension%.xml"
......@@ -80,8 +80,8 @@ set OV_CONVERT_SRC=%1
set OV_CONVERT_DEST=%2
REM launch designer
REM echo "%OV_PATH_BIN%\openvibe-designer" --no-gui --no-session-management --play-fast "!ScenarioFolder!!ScenarioToOpen!"
"%OV_PATH_BIN%\openvibe-designer" --no-gui --no-session-management --play-fast "!ScenarioFolder!!ScenarioToOpen!"
REM echo "%OV_PATH_ROOT%\bin\openvibe-designer" --no-gui --no-session-management --play-fast "!ScenarioFolder!!ScenarioToOpen!"
"%OV_PATH_ROOT%\bin\openvibe-designer" --no-gui --no-session-management --play-fast "!ScenarioFolder!!ScenarioToOpen!"
endlocal
......@@ -20,7 +20,7 @@ IF(WIN32)
FIND_LIBRARY(LIB_OPENAL OpenAL32 PATHS ${PATH_OPENAL}/libs/Win32 NO_DEFAULT_PATH)
IF(LIB_OPENAL)
OV_PRINT(OV_PRINTED " [ OK ] lib ${LIB_OPENAL}")
INSTALL(DIRECTORY "${PATH_OPENAL}/libs/Win32/" DESTINATION "${DIST_BINDIR}/" FILES_MATCHING PATTERN "*.dll")
INSTALL(DIRECTORY "${PATH_OPENAL}/libs/Win32/" DESTINATION "${DIST_BINDIR}/" FILES_MATCHING PATTERN "*.dll" PATTERN "EFX*" EXCLUDE)
ELSE(LIB_OPENAL)
OV_PRINT(OV_PRINTED " [FAILED] lib OpenAL32")
SET(OPENAL_MISSED_SOMETHING YES)
......
......@@ -14,5 +14,5 @@ IF /i "%1"=="--run-bg" (
SHIFT
)
%OV_RUN_IN_BG% "%OV_PATH_BIN%\%OV_RUN_APP%" %1 %2 %3 %4 %5
%OV_RUN_IN_BG% "%OV_PATH_ROOT%\bin\%OV_RUN_APP%" %1 %2 %3 %4 %5
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment