diff --git a/INSTALL.md b/INSTALL.md index c548ab1d7..16a4bb502 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -105,7 +105,7 @@ I'm expecting this to be resolved in the near future though, and as I think Clan It's by the way very easy to switch between LLVM and GCC using Ubuntu, just use the `update-alternatives` command: ``` -user@computer:~$ sudo update-alternatives --config c++ +myusername@computer:~$ sudo update-alternatives --config c++ [sudo] password for user: There are 2 choices for the alternative c++ (providing /usr/bin/c++). @@ -165,7 +165,7 @@ So the home directory will always take precedence, and any resources or themes l Creation of Debian .deb packages is enabled by default, simply run `cpack` to generate the package: ``` -user@computer:~/emulationstation-de$ cpack +myusername@computer:~/emulationstation-de$ cpack CPack: Create package using DEB CPack: Install projects CPack: - Run preinstall target for: emulationstation-de @@ -274,7 +274,7 @@ Running `make -j6` (or whatever number of parallel jobs you prefer) speeds up th Simply run `cpack` to build the .dmg installer: ``` -user@computer:~/emulationstation-de$ cpack +myusername@computer:~/emulationstation-de$ cpack CPack: Create package using DragNDrop CPack: Install projects CPack: - Run preinstall target for: emulationstation-de @@ -599,7 +599,7 @@ For the ROM directory, you can either change it manually in es_settings.cfg, or By default, ES looks in `~/ROMs` for the ROM files, where they are expected to be grouped into directories corresponding to the game systems, for example: ``` -user@computer:~ROMs$ ls -1 +myusername@computer:~ROMs$ ls -1 arcade megadrive pcengine diff --git a/LICENSES/EmulationStation b/LICENSES/EmulationStation deleted file mode 100644 index 125abdaa0..000000000 --- a/LICENSES/EmulationStation +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2014 Alec Lofquist - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 2b18c6270..0e8f9c906 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -125,7 +125,7 @@ if(WIN32) ../libvlc.dll ../libvlccore.dll ../libwinpthread-1.dll ../SDL2.dll DESTINATION .) install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins DESTINATION .) install(FILES ../LICENSE DESTINATION .) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/LICENSES DESTINATION .) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION .) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION .) install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources DESTINATION .) elseif(APPLE) @@ -137,7 +137,7 @@ elseif(APPLE) DESTINATION EmulationStation.app/Contents/Resources) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION EmulationStation.app/Contents/Resources) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/LICENSES + install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION EmulationStation.app/Contents/Resources) else() install(TARGETS emulationstation RUNTIME @@ -150,7 +150,7 @@ else() DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/LICENSES + install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation) diff --git a/LICENSES/DejaVu b/licenses/DejaVu similarity index 100% rename from LICENSES/DejaVu rename to licenses/DejaVu diff --git a/LICENSES/DroidSans b/licenses/DroidSans similarity index 100% rename from LICENSES/DroidSans rename to licenses/DroidSans diff --git a/LICENSES/FontAwesome b/licenses/FontAwesome similarity index 100% rename from LICENSES/FontAwesome rename to licenses/FontAwesome diff --git a/LICENSES/Freesound_CC0 b/licenses/Freesound_CC0 similarity index 100% rename from LICENSES/Freesound_CC0 rename to licenses/Freesound_CC0 diff --git a/LICENSES/Freesound_CCBY b/licenses/Freesound_CCBY similarity index 100% rename from LICENSES/Freesound_CCBY rename to licenses/Freesound_CCBY diff --git a/LICENSES/GNUFreeFont b/licenses/GNUFreeFont similarity index 100% rename from LICENSES/GNUFreeFont rename to licenses/GNUFreeFont diff --git a/LICENSES/MAME b/licenses/MAME similarity index 100% rename from LICENSES/MAME rename to licenses/MAME diff --git a/LICENSES/Nanum b/licenses/Nanum similarity index 100% rename from LICENSES/Nanum rename to licenses/Nanum diff --git a/LICENSES/OpenSans b/licenses/OpenSans similarity index 100% rename from LICENSES/OpenSans rename to licenses/OpenSans diff --git a/LICENSES/nanosvg b/licenses/nanosvg similarity index 100% rename from LICENSES/nanosvg rename to licenses/nanosvg diff --git a/LICENSES/rbsimple-DE b/licenses/rbsimple-DE similarity index 100% rename from LICENSES/rbsimple-DE rename to licenses/rbsimple-DE