Commit 2e568b3c authored by Dieter Devlaminck's avatar Dieter Devlaminck

added accent to keyboard layouts

parent 0124119e
......@@ -5,4 +5,10 @@ dist
build
CMakeLists.txt.*
.*.swp
*~
externals
CMakeLists_full.txt
CMakeLists_COADAPT.txt
coadapt.patch
coadapt.patch.fc19
......@@ -62,6 +62,10 @@ SET(SKIP_DOCUMENTATION "1")
#SET(SKIP_APPLICATIONS_PLATFORM_ACQUISITION-SERVER "1")
#SET(SKIP_APPLICATIONS_PLATFORM_DESIGNER "1")
SET(SKIP_APPLICATIONS_DEMOS_SSVEP-DEMO "1")
SET(SKIP_APPLICATIONS_DEMOS_VR-DEMO "1")
SET(SKIP_EXTERNALS_.GIT "1")
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-modules")
# If you wish you can uncomment the next line and add a file with additional information called OVBranches.cmake to
......
......@@ -14,13 +14,13 @@ IF(WIN32)
ENDIF(WIN32)
IF(UNIX)
FIND_LIBRARY(gMOBIlabplus_LIBRARY NAMES gMOBIlabplus PATHS /usr/lib /usr/local/lib)
IF(gMOBIlabplus_LIBRARY)
MESSAGE(STATUS " Found GMobiLabPlusAPI...")
MESSAGE(STATUS " [ OK ] lib ${gMOBIlabplus_LIBRARY}")
ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyGMobiLabPlusAPI)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gMOBIlabplus_LIBRARY} )
ELSE(gMOBIlabplus_LIBRARY)
#FIND_LIBRARY(gMOBIlabplus_LIBRARY NAMES gMOBIlabplus PATHS /usr/lib /usr/local/lib)
#IF(gMOBIlabplus_LIBRARY)
# MESSAGE(STATUS " Found GMobiLabPlusAPI...")
# MESSAGE(STATUS " [ OK ] lib ${gMOBIlabplus_LIBRARY}")
# ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyGMobiLabPlusAPI)
# TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gMOBIlabplus_LIBRARY} )
#ELSE(gMOBIlabplus_LIBRARY)
MESSAGE(STATUS " FAILED to find GMobiLabPlusAPI...")
ENDIF(gMOBIlabplus_LIBRARY)
#ENDIF(gMOBIlabplus_LIBRARY)
ENDIF(UNIX)
......@@ -32,5 +32,5 @@ CALL "%OV_ENVIRONMENT_FILE%"
:EndOfScript
%OV_PAUSE%
REM %OV_PAUSE%
......@@ -54,7 +54,7 @@
<PredictionArea x="0.05" y="0.25" width="0" height="0" ncolumns="0" nrows="0">
<!--BackgroundColor>10,10,10</BackgroundColor-->
</PredictionArea>
<P300Keyboard x="0.05" y="0.25" width="0.9" height="0.7" numberOfStandardKeys="42">
<P300Keyboard x="0.05" y="0.25" width="0.9" height="0.7" numberOfStandardKeys="43">
<Key x="0" y="0.8" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>A</Label></TextSymbol></Event>
......@@ -329,18 +329,25 @@
<Event id="wrong_feedback"><TextSymbol><Label>?</Label></TextSymbol></Event>
</Key>
<Key x="0.4" y="0.2" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
</Key>
<Key x="0.2" y="0" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>@</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>@</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>@</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>@</Label></TextSymbol></Event>
</Key>
<Key x="0.5" y="0.2" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>'</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>'</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>'</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>'</Label></TextSymbol></Event>
</Key>
<Key x="0.2" y="0" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
</Key>
<Key x="0.4" y="0" width="0.1" height="0.2">
<Action>write</Action>
......
......@@ -54,7 +54,7 @@
<PredictionArea x="0.75" y="0.25" width="0.2" height="0.7" ncolumns="1" nrows="6">
<!--BackgroundColor>10,10,10</BackgroundColor-->
</PredictionArea>
<P300Keyboard x="0.05" y="0.25" width="0.65" height="0.70" numberOfStandardKeys="43">
<P300Keyboard x="0.05" y="0.25" width="0.65" height="0.70" numberOfStandardKeys="44">
<Key x="0" y="0.8" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>A</Label></TextSymbol></Event>
......@@ -336,18 +336,25 @@
<Event id="wrong_feedback"><TextSymbol><Label>?</Label></TextSymbol></Event>
</Key>
<Key x="0.4" y="0.2" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
</Key>
<Key x="0.2" y="0" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>@</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>@</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>@</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>@</Label></TextSymbol></Event>
</Key>
<Key x="0.5" y="0.2" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>'</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>'</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>'</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>'</Label></TextSymbol></Event>
</Key>
<Key x="0.2" y="0" width="0.1" height="0.2">
<Action>write</Action>
<Event id="noflash"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>,</Label></TextSymbol></Event>
</Key>
<Key x="0.4" y="0" width="0.1" height="0.2">
<Action>write</Action>
......
......@@ -539,7 +539,7 @@ if [[ ! -e "$ov_target_folder_hit/no-native-packages.hit" ]]; then
if [[ -e /etc/fedora-release ]]; then
ov_native_package_installed=true
ov_native_package_log_file="$ov_target_folder_log/native-packages.log"
ov_fedora_packages="wget subversion doxygen make automake autoconf cmake unzip gcc gcc-c++ gtk2-devel libglade2-devel gcc-gfortran expat-devel zziplib-devel libtool libXaw-devel python-devel numpy pcre-devel readline-devel freeimage-devel mesa-libGLU-devel freealut-devel libvorbis-devel bzip2 eigen3-devel ogre-devel ois-devel cegui-devel boost-regex boost boost-filesystem boost-thread lua-devel"
ov_fedora_packages="wget subversion doxygen make automake autoconf cmake unzip gcc gcc-c++ gtk2-devel libglade2-devel gcc-gfortran expat-devel zziplib-devel libtool libXaw-devel python-devel numpy pcre-devel readline-devel freeimage-devel mesa-libGLU-devel freealut-devel libvorbis-devel bzip2 eigen3-devel ogre-devel ois-devel cegui-devel boost-regex boost boost-filesystem boost-math boost-thread lua-devel SDL SDL_image SDL-devel SDL_image-devel ftgl ftgl-devel freetype sqlite sqlite-devel"
# for package in $ov_ubuntu_packages; do
# ov_dpkg_output=`dpkg -l $package 2>&1 | grep "^ii"`
# ov_dpkg_retcode=$?
......@@ -681,6 +681,11 @@ if [[ ! -e "$ov_target_folder_hit/no-native-packages.hit" ]]; then
ov_hit_package "ogre"
ov_hit_package "cegui"
ov_hit_package "SDL"
ov_hit_package "SDL_image"
ov_hit_package "ftgl"
ov_hit_package "sqlite"
# mkdir "$ov_target_folder_lib/OGRE" 2> /dev/null
# rm "$ov_target_folder_lib/OGRE/Plugins.cfg" 2> /dev/null
# echo "# Define plugin folder" >> "$ov_target_folder_lib/OGRE/Plugins.cfg"
......@@ -949,6 +954,8 @@ ov_package_url_ncurses=$ov_gnu_mirror/ncurses/ncurses-5.7.tar.gz
ov_package_url_lua=http://www.lua.org/ftp/lua-5.1.4.tar.gz
ov_package_url_swig=http://prdownloads.sourceforge.net/swig/swig-1.3.36.tar.gz
ov_package_url_presage=$ov_sourceforge_mirror/presage/files/presage/0.8.9/presage-0.8.9.tar.gz
#svn://scm.gforge.inria.fr/svn/obt
#svn://scm.gforge.inria.fr/svn/openmask4/OpenMASK
#svn://scm.gforge.inria.fr/svn/openmask4/Tutorial
......@@ -1026,7 +1033,7 @@ ov_package_archive_cmake=`echo "$ov_package_url_cmake" | $ov_sed 's#.*/##g'`
ov_package_archive_obt=`echo "$ov_package_url_obt" | $ov_sed 's#.*/##g'`
ov_package_archive_freeimage=`echo "$ov_package_url_freeimage" | $ov_sed 's#.*/##g'`
ov_package_archive_ois=`echo "$ov_package_url_ois" | $ov_sed 's#.*/##g'`
ov_package_archive_zziplib=`echo "$ov_package_url_zziplib" | $ov_sed 's#.*/##g'`
ov_package_archive_zziplib=`echo "$ov_package_url_zziplib" git repo-config core.sharedRepository true| $ov_sed 's#.*/##g'`
ov_package_archive_cg=`echo "$ov_package_url_cg" | $ov_sed 's#.*/##g'`
ov_package_archive_cegui=`echo "$ov_package_url_cegui" | $ov_sed 's#.*/##g'`
ov_package_archive_ogre=`echo "$ov_package_url_ogre" | $ov_sed 's#.*/##g'`
......@@ -1040,6 +1047,9 @@ ov_package_archive_ncurses=`echo "$ov_package_url_ncurses" | $ov_sed 's#.*/##g'`
ov_package_archive_lua=`echo "$ov_package_url_lua" | $ov_sed 's#.*/##g'`
ov_package_archive_swig=`echo "$ov_package_url_swig" | $ov_sed 's#.*/##g'`
#Presage
ov_package_archive_presage=`echo "$ov_package_url_presage" | $ov_sed 's#.*/##g'`
###########################################
## ##
## several hooks for specific archives ##
......@@ -1121,6 +1131,16 @@ ov_package_configure_hook_itpp='
./configure --prefix=$ov_target_folder CPPFLAGS="-I$ov_target_folder_include" LDFLAGS="-L$ov_target_folder_lib -L$ov_target_folder_lib64" &&
popd'
ov_package_configure_hook_presage='
pushd * &&
./configure CPPFLAGS="-I/usr/include" LDFLAGS="-L/usr/lib" LIBS="-lm" --disable-gprompter --disable-gpresagemate --prefix=$ov_target_folder &&
popd'
ov_package_install_hook_presage='
pushd * &&
make install &&
popd'
if [ "$ov_machine" == "x86_64" ]; then
ov_package_configure_hook_torch='
pushd * &&
......@@ -1479,6 +1499,12 @@ ov_install_package "vrpn"
#ov_install_package "lua"
#ov_install_package "swig"
ov_install_package "SDL"
ov_install_package "SDL_image"
ov_install_package "ftgl"
ov_install_package "sqlite"
ov_install_package "presage"
#rm -f linux-dependencies 2> /dev/null
#ln -sf $ov_environment_configuration_script linux-dependencies
echo "Install linux dependencies done"
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