From 2d0d14f69e5baf931b904e90527e6948e9a8d305 Mon Sep 17 00:00:00 2001 From: Colin Cornaby Date: Mon, 1 Jul 2024 00:36:51 -0700 Subject: [PATCH] Cleaning up executable suffix code --- .../Plasma/FeatureLib/pfPatcher/plManifests.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp b/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp index 7e0563ea00..da46b30f23 100644 --- a/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp +++ b/Sources/Plasma/FeatureLib/pfPatcher/plManifests.cpp @@ -57,23 +57,22 @@ Mead, WA 99021 #else # define PL_EXECUTABLE_SUFFIX ".exe" #endif +#if HS_BUILD_FOR_APPLE +# define PL_EXECUTABLE_SUFFIX ".app" +#elif HS_BUILD_FOR_WIN32 +# define PL_EXECUTABLE_SUFFIX ".exe" +#else +# define PL_EXECUTABLE_SUFFIX "" +#endif plFileName plManifest::ClientExecutable() { -#ifdef HS_BUILD_FOR_MACOS return MANIFEST("plClient" PL_EXECUTABLE_SUFFIX, "UruExplorer" PL_EXECUTABLE_SUFFIX); -#else - return MANIFEST("plClient" PL_EXECUTABLE_SUFFIX, "UruExplorer" PL_EXECUTABLE_SUFFIX); -#endif } plFileName plManifest::PatcherExecutable() { -#ifdef HS_BUILD_FOR_MACOS return MANIFEST("plClient" PL_EXECUTABLE_SUFFIX, "UruExplorer" PL_EXECUTABLE_SUFFIX); -#else - return MANIFEST("plUruLauncher" PL_EXECUTABLE_SUFFIX, "UruLauncher" PL_EXECUTABLE_SUFFIX); -#endif } ST::string plManifest::ClientManifest()