midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup! Network: Added an executable to host an dedicated room for local wifi

Browse Source
This commit is contained in:
B3n30 2017-11-05 20:26:55 +01:00
parent a40ef602a3
commit b3cdf30c65
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis/linux/upload.sh
View File

@ -9,6 +9,7 @@ COMPRESSION_FLAGS="-cJvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/citra/citra "$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" cp build/src/citra_qt/citra-qt "$REV_NAME"
# We need icons on Linux for .desktop entries # We need icons on Linux for .desktop entries

1
.travis/macos/upload.sh
View File

@ -10,6 +10,7 @@ mkdir "$REV_NAME"
cp build/src/citra/citra "$REV_NAME" cp build/src/citra/citra "$REV_NAME"
cp -r build/src/citra_qt/citra-qt.app "$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 # move qt libs into app bundle for deployment
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"

19
src/dedicated_room/citra-room.cpp
View File

@ -40,11 +40,11 @@ static void PrintHelp(const char* argv0) {
"--port The port used for the room\n" "--port The port used for the room\n"
"--max_members The maximum number of players for this room\n" "--max_members The maximum number of players for this room\n"
"--password The password for the room\n" "--password The password for the room\n"
"--preferred-game The prefered game for this room\n" "--preferred-game The preferred game for this room\n"
"--preferred-game-id The prefered game-id for this room\n" "--preferred-game-id The preferred game-id for this room\n"
"--username The username used for announce\n" "--username The username used for announce\n"
"--token The token 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" "-h, --help Display this help and exit\n"
"-v, --version Output version information 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 main(int argc, char** argv) {
int option_index = 0; int option_index = 0;
char* endarg; 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 // This is just to be able to link against core
gladLoadGLLoader(static_cast<GLADloadproc>(SDL_GL_GetProcAddress)); gladLoadGLLoader(static_cast<GLADloadproc>(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()) { if (room_name.empty()) {
std::cout << "room name is empty!\n\n"; std::cout << "room name is empty!\n\n";