From 009240716222fa3fd4a137e7da84fc21d32654c6 Mon Sep 17 00:00:00 2001 From: Trevor Behlman Date: Sat, 11 Jun 2022 18:34:38 -0400 Subject: [PATCH 1/4] Add support for macOS (Darwin) --- RemotePlayWhatever/CMakeLists.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/RemotePlayWhatever/CMakeLists.txt b/RemotePlayWhatever/CMakeLists.txt index e2839f4..6006587 100644 --- a/RemotePlayWhatever/CMakeLists.txt +++ b/RemotePlayWhatever/CMakeLists.txt @@ -7,6 +7,8 @@ if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows") set(SYSTEM_OS "Win") elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") set(SYSTEM_OS "Linux") +elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin") + set(SYSTEM_OS "Linux") # OpenSteamworks' Darwin binaries also target the Linux folder else() message(FATAL_ERROR "Unsupported platform!") endif() @@ -84,15 +86,17 @@ if(${SYSTEM_OS} STREQUAL "Linux") set_target_properties(RemotePlayWhatever PROPERTIES OUTPUT_NAME "remoteplaywhatever") install(TARGETS RemotePlayWhatever DESTINATION "bin") - file(READ "/etc/issue" ISSUE) - string(REGEX MATCH "Debian|Ubuntu" DISTRO ${ISSUE}) - if(DISTRO MATCHES "Ubuntu" OR DISTRO MATCHES "Debian") - set(CPACK_GENERATOR "DEB") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Lets you force steam remote play together for any game") - set(CPACK_PACKAGE_DESCRIPTION "Tiny app that lets you force steam remote play together for any game") - set(CPACK_DEBIAN_PACKAGE_MAINTAINER "m4dEngi") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libwxbase3.0-0v5 (>= 3.0.4+dfsg), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg)") - include(CPack) + if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") + file(READ "/etc/issue" ISSUE) + string(REGEX MATCH "Debian|Ubuntu" DISTRO ${ISSUE}) + if(DISTRO MATCHES "Ubuntu" OR DISTRO MATCHES "Debian") + set(CPACK_GENERATOR "DEB") + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Lets you force steam remote play together for any game") + set(CPACK_PACKAGE_DESCRIPTION "Tiny app that lets you force steam remote play together for any game") + set(CPACK_DEBIAN_PACKAGE_MAINTAINER "m4dEngi") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libwxbase3.0-0v5 (>= 3.0.4+dfsg), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg)") + include(CPack) + endif() endif() endif() From b5401bf5f478086ad72fc038e6fb251621775217 Mon Sep 17 00:00:00 2001 From: Trevor Behlman Date: Sat, 11 Jun 2022 18:35:05 -0400 Subject: [PATCH 2/4] Add macOS-specific .DS_Store files to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3241826..22e2d58 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ install_manifest.txt compile_commands.json CTestTestfile.cmake _deps +.DS_Store From 25eeb672f9740df755ed77e9d4e06d4d009e3509 Mon Sep 17 00:00:00 2001 From: Trevor Behlman Date: Sun, 7 Aug 2022 17:04:37 -0400 Subject: [PATCH 3/4] Pull updated Darwin binaries from OpenSteamworks --- RemotePlayWhatever/CMakeLists.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/RemotePlayWhatever/CMakeLists.txt b/RemotePlayWhatever/CMakeLists.txt index 6006587..c158ebd 100644 --- a/RemotePlayWhatever/CMakeLists.txt +++ b/RemotePlayWhatever/CMakeLists.txt @@ -8,7 +8,7 @@ if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows") elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") set(SYSTEM_OS "Linux") elseif(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Darwin") - set(SYSTEM_OS "Linux") # OpenSteamworks' Darwin binaries also target the Linux folder + set(SYSTEM_OS "OSX") else() message(FATAL_ERROR "Unsupported platform!") endif() @@ -81,22 +81,21 @@ add_dependencies(RemotePlayWhatever OpenSteamAPI) target_compile_definitions(RemotePlayWhatever PRIVATE STEAMWORKS_CLIENT_INTERFACES) target_include_directories(RemotePlayWhatever PUBLIC ${OSW_INCLUDE_PATH} ${wxWidgets_INCLUDE_DIRS}) target_link_libraries(RemotePlayWhatever ${OSW_LIB_PATH} ${wxWidgets_LIBRARIES}) -if(${SYSTEM_OS} STREQUAL "Linux") +if(NOT ${SYSTEM_OS} STREQUAL "Win") target_link_libraries(RemotePlayWhatever ${CMAKE_DL_LIBS}) set_target_properties(RemotePlayWhatever PROPERTIES OUTPUT_NAME "remoteplaywhatever") install(TARGETS RemotePlayWhatever DESTINATION "bin") - - if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") - file(READ "/etc/issue" ISSUE) - string(REGEX MATCH "Debian|Ubuntu" DISTRO ${ISSUE}) - if(DISTRO MATCHES "Ubuntu" OR DISTRO MATCHES "Debian") - set(CPACK_GENERATOR "DEB") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Lets you force steam remote play together for any game") - set(CPACK_PACKAGE_DESCRIPTION "Tiny app that lets you force steam remote play together for any game") - set(CPACK_DEBIAN_PACKAGE_MAINTAINER "m4dEngi") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libwxbase3.0-0v5 (>= 3.0.4+dfsg), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg)") - include(CPack) - endif() +endif() +if(${SYSTEM_OS} MATCHES "Linux") + file(READ "/etc/issue" ISSUE) + string(REGEX MATCH "Debian|Ubuntu" DISTRO ${ISSUE}) + if(DISTRO MATCHES "Ubuntu" OR DISTRO MATCHES "Debian") + set(CPACK_GENERATOR "DEB") + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Lets you force steam remote play together for any game") + set(CPACK_PACKAGE_DESCRIPTION "Tiny app that lets you force steam remote play together for any game") + set(CPACK_DEBIAN_PACKAGE_MAINTAINER "m4dEngi") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libwxbase3.0-0v5 (>= 3.0.4+dfsg), libwxgtk3.0-gtk3-0v5 (>= 3.0.4+dfsg)") + include(CPack) endif() endif() From b0a92b84a47dccd70cd0837df5bd1bd930c7ab23 Mon Sep 17 00:00:00 2001 From: Trevor Behlman Date: Sun, 7 Aug 2022 17:13:46 -0400 Subject: [PATCH 4/4] Pull updated arm64 binaries from OpenSteamworks --- RemotePlayWhatever/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RemotePlayWhatever/CMakeLists.txt b/RemotePlayWhatever/CMakeLists.txt index c158ebd..9385913 100644 --- a/RemotePlayWhatever/CMakeLists.txt +++ b/RemotePlayWhatever/CMakeLists.txt @@ -13,8 +13,10 @@ else() message(FATAL_ERROR "Unsupported platform!") endif() -if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) +if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL x86_64) set(SYSTEM_ARCH "64") +elseif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL arm64) + set(SYSTEM_ARCH "ARM64") else() set(SYSTEM_ARCH "32") endif()