diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-12 18:02:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 18:02:38 +0200 |
| commit | 2231673d42a9f20c8778b068102ae46261a6fb69 (patch) | |
| tree | 9d93f43c983398f96e6a5ae7f39d80559398402a /main/main.cpp | |
| parent | 6dfea347b0f957e2689a127f025988f9aae1ab71 (diff) | |
| parent | 3097c2da963fe355c81816a74824170b6dce697c (diff) | |
Merge pull request #37099 from Faless/js/debugger_4.0
WebSocket profiler for HTML5 platform [4.0]
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/main.cpp b/main/main.cpp index 83c3e190a8..958d964b35 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -324,7 +324,7 @@ void Main::print_help(const char *p_binary) { OS::get_singleton()->print(" -b, --breakpoints Breakpoint list as source::line comma-separated pairs, no spaces (use %%20 instead).\n"); OS::get_singleton()->print(" --profiling Enable profiling in the script debugger.\n"); OS::get_singleton()->print(" --gpu-abort Abort on GPU errors (usually validation layer errors), may help see the problem if your system freezes.\n"); - OS::get_singleton()->print(" --remote-debug <address> Remote debug (<host/IP>:<port> address).\n"); + OS::get_singleton()->print(" --remote-debug <uri> Remote debug (<protocol>://<host/IP>[:<port>], e.g. tcp://127.0.0.1:6007).\n"); #if defined(DEBUG_ENABLED) && !defined(SERVER_ENABLED) OS::get_singleton()->print(" --debug-collisions Show collision shapes when running the scene.\n"); OS::get_singleton()->print(" --debug-navigation Show navigation polygons when running the scene.\n"); @@ -844,11 +844,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph if (I->next()) { debug_uri = I->next()->get(); - if (debug_uri.find(":") == -1) { // wrong address - OS::get_singleton()->print("Invalid debug host address, it should be of the form <host/IP>:<port>.\n"); + if (debug_uri.find("://") == -1) { // wrong address + OS::get_singleton()->print("Invalid debug host address, it should be of the form <protocol>://<host/IP>:<port>.\n"); goto error; } - debug_uri = "tcp://" + debug_uri; // will support multiple protocols eventually. N = I->next()->next(); } else { OS::get_singleton()->print("Missing remote debug host address, aborting.\n"); |