ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove references to dev9ghzdrk. If dev9 is built in, we need to always do the setcap check when not disabled, not just if dev9ghzdrk is built.

This commit is contained in:
Shanoah Alkire 2020-10-31 19:45:15 -07:00
parent 86e6745f21
commit 5e6cb22eeb
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@ -239,7 +239,6 @@ for ARG in "$@"; do
echo
echo "** Distribution Compatibilities **"
echo "--sdl12 : Build with SDL1.2 (requires if wx is linked against SDL1.2)"
echo "--no-dev9ghzdrk : Skip dev9ghzdrk. (Avoids needing escalated privileges to build.)"
echo "--no-portaudio : Skip portaudio for spu2x."
echo
echo "** Expert Developer option **"

1
linux_various/check_format.sh
View File

@ -46,7 +46,6 @@ fi
files=`git diff --name-only --diff-filter=ACMRT $diff_range -- $PWD | \
grep "\.\(c\|h\|inl\|cpp\|hpp\)$" | \
grep -v "${1}pcsx2/" | \
grep -v "${1}plugins/dev9ghzdrk/" | \
grep -v "${1}plugins/GSdx/" | \
grep -v "${1}plugins/USBqemu/" | \
\

12
pcsx2/CMakeLists.txt
View File

@ -926,12 +926,10 @@ if (APPLE)
add_dependencies(pcsx2-postprocess-bundle ${Output})
endif()
if(dev9ghzdrk)
if(NOT DISABLE_SETCAP)
if(PACKAGE_MODE)
install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set +x\")")
else()
install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
endif()
if(NOT DISABLE_SETCAP)
if(PACKAGE_MODE)
install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${BIN_DIR}/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${BIN_DIR}/${Output}; set +x\")")
else()
install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f ${CMAKE_SOURCE_DIR}/bin/${Output} ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' ${CMAKE_SOURCE_DIR}/bin/${Output}; set +x\")")
endif()
endif()

3
pcsx2/Docs/PCSX2_FAQ.md
View File

@ -157,10 +157,7 @@ The PS2 EE, IOP and VU processors are substantially different from a PC CPU and
### What are PCSX2 plugins?
PCSX2 uses a plugin framework for various sections of the emulator. A plugin is a small, incomplete piece of software that, when plugged in to another piece of software, provides some sort of additional function. PCSX2 uses plugins for:
* Video (GSdx)
* Audio (SPU2-X)
* Controls (Lilypad for Windows, OnePad for Linux)
* CD/DVD Drives (CDVDGigaherz)
* PS2 Networking/HDD Adapter (DEV9ghzdrk)
* USB (No plugin included)
* Firewire (No plugin included)