From 178462027e7b87a965c00e37a38379f4d9830a3b Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 18 Apr 2011 16:29:48 +0200 Subject: [PATCH] New compilation method --- Buffer/Makefile | 4 +++- Connector_HTTP/Makefile | 4 +++- Connector_HTTP/main.cpp | 8 -------- Connector_RAW/Makefile | 4 +++- Connector_RTMP/Makefile | 4 +++- Connector_RTMP/main.cpp | 7 ------- Connector_RTSP/Makefile | 4 +++- Makefile | 6 ++++++ util/rtmpchunks.h | 1 - 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Buffer/Makefile b/Buffer/Makefile index 63cc2524..6cbfba70 100644 --- a/Buffer/Makefile +++ b/Buffer/Makefile @@ -2,7 +2,9 @@ SRC = main.cpp ../util/ddv_socket.cpp ../util/flv_tag.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_Buffer INCLUDES = -CCFLAGS = -Wall -Wextra -funsigned-char -g +DEBUG = 4 +OPTIMIZE = -g +CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar diff --git a/Connector_HTTP/Makefile b/Connector_HTTP/Makefile index 3ce05f27..2a9f9168 100644 --- a/Connector_HTTP/Makefile +++ b/Connector_HTTP/Makefile @@ -2,7 +2,9 @@ SRC = main.cpp ../util/ddv_socket.cpp ../util/http_parser.cpp ../util/flv_tag.cp OBJ = $(SRC:.cpp=.o) OUT = DDV_Conn_HTTP INCLUDES = -CCFLAGS = -Wall -Wextra -funsigned-char -g +DEBUG = 4 +OPTIMIZE = -g +CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar diff --git a/Connector_HTTP/main.cpp b/Connector_HTTP/main.cpp index 4ba94342..8c222c54 100644 --- a/Connector_HTTP/main.cpp +++ b/Connector_HTTP/main.cpp @@ -1,14 +1,6 @@ /// \file Connector_HTTP/main.cpp /// Contains the main code for the HTTP Connector -/// Sets the global debugging level. -// debugging level 0 = nothing -// debugging level 1 = critical errors -// debugging level 2 = errors -// debugging level 3 = status information -// debugging level 4 = extremely verbose status information -#define DEBUG 4 - #include #include #include diff --git a/Connector_RAW/Makefile b/Connector_RAW/Makefile index aaf541a1..7d61804a 100644 --- a/Connector_RAW/Makefile +++ b/Connector_RAW/Makefile @@ -2,7 +2,9 @@ SRC = main.cpp ../util/ddv_socket.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_Conn_RAW INCLUDES = -CCFLAGS = -Wall -Wextra -funsigned-char -g +DEBUG = 4 +OPTIMIZE = -g +CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar diff --git a/Connector_RTMP/Makefile b/Connector_RTMP/Makefile index dfb274a8..f13d743c 100644 --- a/Connector_RTMP/Makefile +++ b/Connector_RTMP/Makefile @@ -3,7 +3,9 @@ OBJ = $(SRC:.cpp=.o) OUT = DDV_Conn_RTMP INCLUDES = STATIC = -CCFLAGS = -Wall -Wextra -funsigned-char -g +DEBUG = 4 +OPTIMIZE = -g +CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar diff --git a/Connector_RTMP/main.cpp b/Connector_RTMP/main.cpp index e6265733..91c25e19 100644 --- a/Connector_RTMP/main.cpp +++ b/Connector_RTMP/main.cpp @@ -1,13 +1,6 @@ /// \file Connector_RTMP/main.cpp /// Contains the main code for the RTMP Connector -//debugging level 0 = nothing -//debugging level 1 = critical errors -//debugging level 2 = errors -//debugging level 3 = status information -//debugging level 4 = extremely verbose status information -#define DEBUG 4 - #include #include #include diff --git a/Connector_RTSP/Makefile b/Connector_RTSP/Makefile index 425a9613..f628e588 100644 --- a/Connector_RTSP/Makefile +++ b/Connector_RTSP/Makefile @@ -2,7 +2,9 @@ SRC = main.cpp ../sockets/sw_base.cpp ../sockets/sw_inet.cpp ../sockets/sw_unix. OBJ = $(SRC:.cpp=.o) OUT = Connector_RTSP INCLUDES = -I/usr/local/include/jthread/ -CCFLAGS = -Wall -Wextra -funsigned-char -g +DEBUG = 4 +OPTIMIZE = -g +CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) CC = $(CROSS)g++ LD = $(CROSS)ld AR = $(CROSS)ar diff --git a/Makefile b/Makefile index 0389a1ad..ab5dea23 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,12 @@ client-clean: cd Connector_RAW; $(MAKE) clean cd Buffer; $(MAKE) clean clean: client-clean +client-release: client-clean + cd Connector_HTTP; $(MAKE) DEBUG=0 OPTIMIZE=-O2 + cd Connector_RTMP; $(MAKE) DEBUG=0 OPTIMIZE=-O2 + cd Connector_RAW; $(MAKE) DEBUG=0 OPTIMIZE=-O2 + cd Buffer; $(MAKE) DEBUG=0 OPTIMIZE=-O2 +release: client-release client-install: client-clean client cd Connector_RTMP; $(MAKE) install cd Connector_HTTP; $(MAKE) install diff --git a/util/rtmpchunks.h b/util/rtmpchunks.h index b11142c8..8feeefb0 100644 --- a/util/rtmpchunks.h +++ b/util/rtmpchunks.h @@ -8,7 +8,6 @@ #include #include #include -#define DEBUG 4 /// Contains all functions and classes needed for RTMP connections. namespace RTMPStream{