From b3cdf30c65c2b07a847dd884ac6a0ba1ac77dd03 Mon Sep 17 00:00:00 2001 From: B3n30 Date: Sun, 5 Nov 2017 20:26:55 +0100 Subject: [PATCH] fixup! Network: Added an executable to host an dedicated room for local wifi --- .travis/linux/upload.sh | 1 + .travis/macos/upload.sh | 1 + src/dedicated_room/citra-room.cpp | 19 +++---------------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index 7584bbd1f..e9150d7a0 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -9,6 +9,7 @@ COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" cp build/src/citra/citra "$REV_NAME" +cp build/src/citra/citra-room "$REV_NAME" cp build/src/citra_qt/citra-qt "$REV_NAME" # We need icons on Linux for .desktop entries diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index 19c80fdf0..fa2380fc2 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -10,6 +10,7 @@ mkdir "$REV_NAME" cp build/src/citra/citra "$REV_NAME" cp -r build/src/citra_qt/citra-qt.app "$REV_NAME" +cp build/src/citra/citra-room "$REV_NAME" # move qt libs into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" diff --git a/src/dedicated_room/citra-room.cpp b/src/dedicated_room/citra-room.cpp index 8769934cf..d834a7aa0 100644 --- a/src/dedicated_room/citra-room.cpp +++ b/src/dedicated_room/citra-room.cpp @@ -40,11 +40,11 @@ static void PrintHelp(const char* argv0) { "--port The port used for the room\n" "--max_members The maximum number of players for this room\n" "--password The password for the room\n" - "--preferred-game The prefered game for this room\n" - "--preferred-game-id The prefered game-id for this room\n" + "--preferred-game The preferred game for this room\n" + "--preferred-game-id The preferred game-id for this room\n" "--username The username used for announce\n" "--token The token used for announce\n" - "--announce-url The url to the announce server" + "--announce-url The url to the announce server\n" "-h, --help Display this help and exit\n" "-v, --version Output version information and exit\n"; } @@ -58,15 +58,6 @@ static void PrintVersion() { int main(int argc, char** argv) { int option_index = 0; char* endarg; -#ifdef _WIN32 - int argc_w; - auto argv_w = CommandLineToArgvW(GetCommandLineW(), &argc_w); - - if (argv_w == nullptr) { - LOG_CRITICAL(Frontend, "Failed to get command line arguments"); - return -1; - } -#endif // This is just to be able to link against core gladLoadGLLoader(static_cast(SDL_GL_GetProcAddress)); @@ -136,10 +127,6 @@ int main(int argc, char** argv) { } } } - std::cout << port << std::endl; -#ifdef _WIN32 - LocalFree(argv_w); -#endif if (room_name.empty()) { std::cout << "room name is empty!\n\n";