From 0b3542a57312c0bf81275ef5ab3fccb28d0bb7c1 Mon Sep 17 00:00:00 2001 From: rz5 Date: Sun, 28 Feb 2016 13:01:02 +0000 Subject: [PATCH] Move linux file to linux-various to avoid including it in win builds. Changed the condition around for sake of ease of reading. --- CMakeLists.txt | 9 ++++++++- {bin => linux_various}/PCSX2-linux.sh | 0 2 files changed, 8 insertions(+), 1 deletion(-) rename {bin => linux_various}/PCSX2-linux.sh (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fcaaa3fcc..2504065492 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,6 +86,7 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/plugins") endif() #------------------------------------------------------------------------------- + # Install some files to ease package creation if(PACKAGE_MODE) if(NOT DISABLE_CHEATS_ZIP) @@ -107,6 +108,12 @@ if(PACKAGE_MODE) INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2_Readme.pdf" DESTINATION "${DOC_DIR}") INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/") if(NOT DISABLE_PCSX2_WRAPPER) - INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/PCSX2-linux.sh" DESTINATION "${BIN_DIR}") + INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/PCSX2-linux.sh" DESTINATION "${BIN_DIR}") + endif() + +else() + if(NOT DISABLE_PCSX2_WRAPPER) + # special case to avoid having linux files in windows + INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/PCSX2-linux.sh" DESTINATION "${CMAKE_SOURCE_DIR}/bin") endif() endif() diff --git a/bin/PCSX2-linux.sh b/linux_various/PCSX2-linux.sh similarity index 100% rename from bin/PCSX2-linux.sh rename to linux_various/PCSX2-linux.sh