From 0b3b9df50a5410223cb08f59e89c2764decce2dd Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Wed, 16 Jun 2010 14:42:43 +0200 Subject: [PATCH] Client and Makefiles Edited --- Client/Makefile | 2 +- Client/main.cpp | 2 ++ Server/Makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Client/Makefile b/Client/Makefile index c0d40be8..e52f7a3e 100644 --- a/Client/Makefile +++ b/Client/Makefile @@ -1,6 +1,6 @@ SRC = main.cpp sockets/sw_base.cpp sockets/sw_inet.cpp sockets/sw_unix.cpp OBJ = $(SRC:.cpp=.o) -OUT = Socket +OUT = Client_PLS INCLUDES = CCFLAGS = -Wall -Wextra -funsigned-char -g CC = $(CROSS)g++ diff --git a/Client/main.cpp b/Client/main.cpp index 695d431a..b10b2124 100644 --- a/Client/main.cpp +++ b/Client/main.cpp @@ -12,7 +12,9 @@ int main() { mySocket.connect("/tmp/socketfile"); char buffer[500000]; int msg; + std::string input; // do something with mySocket... + while( std::cin >> input && input != "") {} std::cout << "HTTP/1.1 200 OK\nConnection: close\nContent-Type: video/x-flv\n\n"; while(true) { msg = mySocket.recv(&buffer[0],10000); diff --git a/Server/Makefile b/Server/Makefile index c0afa672..ad5f93e7 100644 --- a/Server/Makefile +++ b/Server/Makefile @@ -1,6 +1,6 @@ SRC = main.cpp user.cpp sockets/sw_base.cpp sockets/sw_inet.cpp sockets/sw_unix.cpp OBJ = $(SRC:.cpp=.o) -OUT = Socket +OUT = Server_PLS INCLUDES = CCFLAGS = -Wall -Wextra -funsigned-char -g CC = $(CROSS)g++