From 7ff12a36b986ea8648f5cd5f1e4df5b6a7ca14d6 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Sat, 30 May 2020 11:23:39 -0700 Subject: [PATCH] embedded help --- httpd.cpp | 7 ++++--- makefile | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/httpd.cpp b/httpd.cpp index d09ffbb8..0817a985 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -14,9 +14,10 @@ int main(int argc, char** argv) { if (argc != 3) { - std::cerr << "Usage: httpd " << std::endl; - std::cerr << " ./a.out 9090 127.0.0.1" << std::endl; - std::cerr << " ./a.out 9090 0.0.0.0" << std::endl; + std::cerr << "Usage: " << argv[0] + << " " << std::endl; + std::cerr << " " << argv[0] << " 9090 127.0.0.1" << std::endl; + std::cerr << " " << argv[0] << " 9090 0.0.0.0" << std::endl; return 1; } diff --git a/makefile b/makefile index b849ab4d..fd8da709 100644 --- a/makefile +++ b/makefile @@ -189,10 +189,11 @@ httpd: ixwebsocket/IXConnectionState.cpp \ ixwebsocket/IXUrlParser.cpp \ ixwebsocket/IXSelectInterrupt.cpp \ - ixwebsocket/apple/IXSetThreadName_apple.cpp -lz + ixwebsocket/apple/IXSetThreadName_apple.cpp \ + -lz httpd_linux: - g++ --std=c++11 -o /usr/local/bin/ixhttpd httpd.cpp -Iixwebsocket \ + g++ --std=c++11 -o ixhttpd httpd.cpp -Iixwebsocket \ ixwebsocket/IXSelectInterruptFactory.cpp \ ixwebsocket/IXCancellationRequest.cpp \ ixwebsocket/IXSocketTLSOptions.cpp \ @@ -211,7 +212,9 @@ httpd_linux: ixwebsocket/IXConnectionState.cpp \ ixwebsocket/IXUrlParser.cpp \ ixwebsocket/IXSelectInterrupt.cpp \ - ixwebsocket/linux/IXSetThreadName_linux.cpp -lz -lpthread + ixwebsocket/linux/IXSetThreadName_linux.cpp \ + -lz -lpthread + cp -f ixhttpd /usr/local/bin # For the fork that is configured with appveyor rebase_upstream: