hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC. Forced to Jaron's style, for now. May change later.

Browse source 
Conflicts:
	Buffer/Makefile
	Connector_HTTP/Makefile
	Connector_RAW/Makefile
	Connector_RTMP/Makefile
This commit is contained in:
Thulinma 2012-04-27 21:11:10 +02:00
commit b271cd0fe7
6 changed files with 7 additions and 1163 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Controller/Makefile
View file

@ -9,6 +9,7 @@ COMPILED_USERNAME = testuser
COMPILED_PASSWORD = 179ad45c6ce2cb97cf1029e212046e81
#COMPILED_PASSWORD = testpass
CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) -DCOMPILED_USERNAME=$(COMPILED_USERNAME) -DCOMPILED_PASSWORD=$(COMPILED_PASSWORD) -DVERSION=$(VERSION)
INSTALL = install
CC = $(CROSS)g++
LD = $(CROSS)ld
AR = $(CROSS)ar
@ -24,4 +25,6 @@ clean:
rm -rf $(OBJ) ../bin/$(OUT) Makefile.bak *~
cversion:
rm -rf ../util/config.o
install: $(OUT)
$(INSTALL) -D ./$(OUT) $(DESTDIR)/usr/bin/$(OUT)