- added hard coded team chat hotkey H to configurable keys
- changed dependency finder script to use only desired libs
This commit is contained in:
parent
a2f013c51a
commit
a9b0f31816
|
@ -39,6 +39,7 @@ HotKeySelectStoreUnit=T
|
||||||
HotKeySelectedUnitsAttack=A
|
HotKeySelectedUnitsAttack=A
|
||||||
HotKeySelectedUnitsStop=S
|
HotKeySelectedUnitsStop=S
|
||||||
HotKeyToggleOSMouseEnabled=/
|
HotKeyToggleOSMouseEnabled=/
|
||||||
|
ChatTeamMode=H
|
||||||
|
|
||||||
; === propertyMap File ===
|
; === propertyMap File ===
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,20 @@ sync_support_libs(){
|
||||||
local pFILE="$2" # bin file to scan for dependencies from
|
local pFILE="$2" # bin file to scan for dependencies from
|
||||||
local files=""
|
local files=""
|
||||||
local _cp="/bin/cp"
|
local _cp="/bin/cp"
|
||||||
local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
||||||
|
local skip_deps=""
|
||||||
|
local keep_deps="libcurl libgnu libicu liblua libxerces"
|
||||||
|
|
||||||
|
local scan_via_skiplist=1
|
||||||
|
|
||||||
|
if [ -n "$skip_deps" ]; then
|
||||||
|
scan_via_skiplist=1
|
||||||
|
echo 'scanning for deps TO SKIP...'
|
||||||
|
elif [ -n "$keep_deps" ]; then
|
||||||
|
scan_via_skiplist=0
|
||||||
|
echo 'scanning for deps TO KEEP...'
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# get rid of blanks and (0x00007fff0117f000)
|
# get rid of blanks and (0x00007fff0117f000)
|
||||||
files="$(ldd $pFILE | awk '{ print $3 }' | sed -e '/^$/d' -e '/(*)$/d')"
|
files="$(ldd $pFILE | awk '{ print $3 }' | sed -e '/^$/d' -e '/(*)$/d')"
|
||||||
|
@ -34,14 +47,27 @@ sync_support_libs(){
|
||||||
# echo ${_cp} -f $i ${d}
|
# echo ${_cp} -f $i ${d}
|
||||||
|
|
||||||
skipfile=0
|
skipfile=0
|
||||||
for j in $(echo $skip_deps)
|
|
||||||
do
|
if [ $scan_via_skiplist -eq 1 ]; then
|
||||||
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
|
for j in $(echo $skip_deps)
|
||||||
# echo Skipping file = [$i]
|
do
|
||||||
skipfile=1
|
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
|
||||||
break
|
# echo Skipping file = [$i]
|
||||||
fi
|
skipfile=1
|
||||||
done
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
elif [ $scan_via_skiplist -eq 0 ]; then
|
||||||
|
skipfile=1
|
||||||
|
for j in $(echo $keep_deps)
|
||||||
|
do
|
||||||
|
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
|
||||||
|
# echo Skipping file = [$i]
|
||||||
|
skipfile=0
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
if [ $skipfile -eq 0 ]; then
|
if [ $skipfile -eq 0 ]; then
|
||||||
echo Including file = [$i]
|
echo Including file = [$i]
|
||||||
|
|
|
@ -20,7 +20,20 @@ sync_support_libs(){
|
||||||
local pFILE="$2" # bin file to scan for dependencies from
|
local pFILE="$2" # bin file to scan for dependencies from
|
||||||
local files=""
|
local files=""
|
||||||
local _cp="/bin/cp"
|
local _cp="/bin/cp"
|
||||||
local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
||||||
|
local skip_deps=""
|
||||||
|
local keep_deps="libcurl libgnu libicu liblua libxerces"
|
||||||
|
|
||||||
|
local scan_via_skiplist=1
|
||||||
|
|
||||||
|
if [ -n "$skip_deps" ]; then
|
||||||
|
scan_via_skiplist=1
|
||||||
|
echo 'scanning for deps TO SKIP...'
|
||||||
|
elif [ -n "$keep_deps" ]; then
|
||||||
|
scan_via_skiplist=0
|
||||||
|
echo 'scanning for deps TO KEEP...'
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# get rid of blanks and (0x00007fff0117f000)
|
# get rid of blanks and (0x00007fff0117f000)
|
||||||
files="$(ldd $pFILE | awk '{ print $3 }' | sed -e '/^$/d' -e '/(*)$/d')"
|
files="$(ldd $pFILE | awk '{ print $3 }' | sed -e '/^$/d' -e '/(*)$/d')"
|
||||||
|
@ -34,14 +47,27 @@ sync_support_libs(){
|
||||||
# echo ${_cp} -f $i ${d}
|
# echo ${_cp} -f $i ${d}
|
||||||
|
|
||||||
skipfile=0
|
skipfile=0
|
||||||
|
|
||||||
|
if [ $scan_via_skiplist -eq 1 ]; then
|
||||||
for j in $(echo $skip_deps)
|
for j in $(echo $skip_deps)
|
||||||
do
|
do
|
||||||
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
|
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
|
||||||
# echo Skipping file = [$i]
|
# echo Skipping file = [$i]
|
||||||
skipfile=1
|
skipfile=1
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
elif [ $scan_via_skiplist -eq 0 ]; then
|
||||||
|
skipfile=1
|
||||||
|
for j in $(echo $keep_deps)
|
||||||
|
do
|
||||||
|
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
|
||||||
|
# echo Skipping file = [$i]
|
||||||
|
skipfile=0
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
if [ $skipfile -eq 0 ]; then
|
if [ $skipfile -eq 0 ]; then
|
||||||
echo Including file = [$i]
|
echo Including file = [$i]
|
||||||
|
|
|
@ -82,16 +82,18 @@ void ChatManager::keyDown(char key){
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Lang &lang= Lang::getInstance();
|
Lang &lang= Lang::getInstance();
|
||||||
|
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
|
||||||
|
|
||||||
//toggle team mode
|
//toggle team mode
|
||||||
if(editEnabled == false && disableTeamMode == false && key=='H') {
|
if(editEnabled == false && disableTeamMode == false &&
|
||||||
|
key == configKeys.getCharKey("ChatTeamMode")) {
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,key,key);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,key,key);
|
||||||
|
|
||||||
if(teamMode){
|
if(teamMode == true) {
|
||||||
teamMode= false;
|
teamMode= false;
|
||||||
console->addLine(lang.get("ChatMode") + ": " + lang.get("All"));
|
console->addLine(lang.get("ChatMode") + ": " + lang.get("All"));
|
||||||
}
|
}
|
||||||
else{
|
else {
|
||||||
teamMode= true;
|
teamMode= true;
|
||||||
console->addLine(lang.get("ChatMode") + ": " + lang.get("Team"));
|
console->addLine(lang.get("ChatMode") + ": " + lang.get("Team"));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue