Shared memory rewrite
This commit is contained in:
Thulinma
parent
afcddbfca6
commit
cd2fe225c5
81 changed files with 7775 additions and 5411 deletions
162
Makefile
162
Makefile
|
|
@ -23,7 +23,7 @@ LDLIBS = -lmist -lrt
|
|||
|
||||
.DEFAULT_GOAL := all
|
||||
|
||||
all: controller buffers connectors analysers converters
|
||||
all: MistConnHTTP controller analysers inputs outputs
|
||||
|
||||
DOXYGEN := $(shell doxygen -v 2> /dev/null)
|
||||
ifdef DOXYGEN
|
||||
|
|
@ -33,71 +33,15 @@ $(warning Doxygen not installed - not building source documentation.)
|
|||
endif
|
||||
|
||||
controller: MistController
|
||||
MistController: override LDLIBS += $(THREADLIB)
|
||||
MistController: src/controller/server.html.h src/controller/*
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) src/controller/*.cpp $(LDLIBS) -o $@
|
||||
|
||||
buffers: MistPlayer
|
||||
MistPlayer: src/buffer/player.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
buffers: MistBuffer
|
||||
MistBuffer: override LDLIBS += $(THREADLIB)
|
||||
MistBuffer: src/buffer/buffer.cpp src/buffer/buffer_stream.h src/buffer/buffer_stream.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) src/buffer/buffer.cpp src/buffer/buffer_stream.cpp $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnRaw
|
||||
MistConnRaw: src/connectors/conn_raw.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnRTMP
|
||||
MistConnRTMP: src/connectors/conn_rtmp.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTP
|
||||
MistConnHTTP: override LDLIBS += $(THREADLIB)
|
||||
MistConnHTTP: src/connectors/conn_http.cpp src/connectors/embed.js.h src/connectors/icon.h
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $< $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPProgressiveFLV
|
||||
MistConnHTTPProgressiveFLV: src/connectors/conn_http_progressive_flv.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPProgressiveMP3
|
||||
MistConnHTTPProgressiveMP3: src/connectors/conn_http_progressive_mp3.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPProgressiveMP4
|
||||
MistConnHTTPProgressiveMP4: src/connectors/conn_http_progressive_mp4.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPProgressiveOGG
|
||||
MistConnHTTPProgressiveOGG: src/connectors/conn_http_progressive_ogg.cpp src/converters/oggconv.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPDynamic
|
||||
MistConnHTTPDynamic: src/connectors/conn_http_dynamic.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPSmooth
|
||||
MistConnHTTPSmooth: src/connectors/conn_http_smooth.cpp src/connectors/xap.h
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $< $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPLive
|
||||
MistConnHTTPLive: src/connectors/conn_http_live.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPSRT
|
||||
MistConnHTTPSRT: src/connectors/conn_http_srt.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnHTTPJSON
|
||||
MistConnHTTPJSON: src/connectors/conn_http_json.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
connectors: MistConnTS
|
||||
MistConnTS: src/connectors/conn_ts.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
analysers: MistAnalyserRTMP
|
||||
MistAnalyserRTMP: src/analysers/rtmp_analyser.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
|
@ -134,14 +78,6 @@ converters: MistFLV2DTSC
|
|||
MistFLV2DTSC: src/converters/flv2dtsc.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
converters: MistOGG2DTSC
|
||||
MistOGG2DTSC: src/converters/ogg2dtsc.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
converters: MistDTSC2OGG
|
||||
MistDTSC2OGG: src/converters/dtsc2ogg.cpp src/converters/oggconv.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
converters: MistDTSCFix
|
||||
MistDTSCFix: src/converters/dtscfix.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
|
@ -162,8 +98,98 @@ converters: MistDTSC2SRT
|
|||
MistDTSC2SRT: src/converters/dtsc2srt.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
inputs: MistInDTSC
|
||||
MistInDTSC: override LDLIBS += $(THREADLIB)
|
||||
MistInDTSC: override CPPFLAGS += "-DINPUTTYPE=\"input_dtsc.h\""
|
||||
MistInDTSC: src/input/mist_in.cpp src/input/input.cpp src/input/input_dtsc.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
inputs: MistInFLV
|
||||
MistInFLV: override LDLIBS += $(THREADLIB)
|
||||
MistInFLV: override CPPFLAGS += "-DINPUTTYPE=\"input_flv.h\""
|
||||
MistInFLV: src/input/mist_in.cpp src/input/input.cpp src/input/input_flv.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
inputs: MistInOGG
|
||||
MistInOGG: override LDLIBS += $(THREADLIB)
|
||||
MistInOGG: override CPPFLAGS += "-DINPUTTYPE=\"input_ogg.h\""
|
||||
MistInOGG: src/input/mist_in.cpp src/input/input.cpp src/input/input_ogg.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
inputs: MistInBuffer
|
||||
MistInBuffer: override LDLIBS += $(THREADLIB)
|
||||
MistInBuffer: override CPPFLAGS += "-DINPUTTYPE=\"input_buffer.h\""
|
||||
MistInBuffer: src/input/mist_in.cpp src/input/input.cpp src/input/input_buffer.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutFLV
|
||||
MistOutFLV: override LDLIBS += $(THREADLIB)
|
||||
MistOutFLV: override CPPFLAGS += "-DOUTPUTTYPE=\"output_progressive_flv.h\""
|
||||
MistOutFLV: src/output/mist_out.cpp src/output/output.cpp src/output/output_progressive_flv.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutMP4
|
||||
MistOutMP4: override LDLIBS += $(THREADLIB)
|
||||
MistOutMP4: override CPPFLAGS += "-DOUTPUTTYPE=\"output_progressive_mp4.h\""
|
||||
MistOutMP4: src/output/mist_out.cpp src/output/output.cpp src/output/output_progressive_mp4.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutMP3
|
||||
MistOutMP3: override LDLIBS += $(THREADLIB)
|
||||
MistOutMP3: override CPPFLAGS += "-DOUTPUTTYPE=\"output_progressive_mp3.h\""
|
||||
MistOutMP3: src/output/mist_out.cpp src/output/output.cpp src/output/output_progressive_mp3.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutRTMP
|
||||
MistOutRTMP: override LDLIBS += $(THREADLIB)
|
||||
MistOutRTMP: override CPPFLAGS += "-DOUTPUTTYPE=\"output_rtmp.h\""
|
||||
MistOutRTMP: src/output/mist_out.cpp src/output/output.cpp src/output/output_rtmp.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutRaw
|
||||
MistOutRaw: override LDLIBS += $(THREADLIB)
|
||||
MistOutRaw: override CPPFLAGS += "-DOUTPUTTYPE=\"output_raw.h\""
|
||||
MistOutRaw: src/output/mist_out.cpp src/output/output.cpp src/output/output_raw.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutTS
|
||||
MistOutTS: override LDLIBS += $(THREADLIB)
|
||||
MistOutTS: override CPPFLAGS += "-DOUTPUTTYPE=\"output_ts.h\""
|
||||
MistOutTS: src/output/mist_out.cpp src/output/output.cpp src/output/output_ts.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutHSS
|
||||
MistOutHSS: override LDLIBS += $(THREADLIB)
|
||||
MistOutHSS: override CPPFLAGS += "-DOUTPUTTYPE=\"output_hss.h\""
|
||||
MistOutHSS: src/output/mist_out.cpp src/output/output.cpp src/output/output_hss.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutHLS
|
||||
MistOutHLS: override LDLIBS += $(THREADLIB)
|
||||
MistOutHLS: override CPPFLAGS += "-DOUTPUTTYPE=\"output_hls.h\""
|
||||
MistOutHLS: src/output/mist_out.cpp src/output/output.cpp src/output/output_hls.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutHDS
|
||||
MistOutHDS: override LDLIBS += $(THREADLIB)
|
||||
MistOutHDS: override CPPFLAGS += "-DOUTPUTTYPE=\"output_hds.h\""
|
||||
MistOutHDS: src/output/mist_out.cpp src/output/output.cpp src/output/output_hds.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutSRT
|
||||
MistOutSRT: override LDLIBS += $(THREADLIB)
|
||||
MistOutSRT: override CPPFLAGS += "-DOUTPUTTYPE=\"output_srt.h\""
|
||||
MistOutSRT: src/output/mist_out.cpp src/output/output.cpp src/output/output_srt.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
outputs: MistOutJSON
|
||||
MistOutJSON: override LDLIBS += $(THREADLIB)
|
||||
MistOutJSON: override CPPFLAGS += "-DOUTPUTTYPE=\"output_json.h\""
|
||||
MistOutJSON: src/output/mist_out.cpp src/output/output.cpp src/output/output_json.cpp
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $^ $(LDLIBS) -o $@
|
||||
|
||||
BUILT_SOURCES=controller/server.html.h connectors/embed.js.h
|
||||
lspSOURCES=lsp/jquery.js lsp/placeholder.js lsp/md5.js lsp/main.js lsp/pages.js lsp/tablesort.js
|
||||
lspSOURCES=lsp/plugins/jquery.js lsp/plugins/placeholder.js lsp/plugins/md5.js lsp/main.js lsp/pages.js lsp/plugins/tablesort.js lsp/plugins/jquery.flot.min.js lsp/plugins/jquery.flot.time.min.js lsp/plugins/jquery.flot.crosshair.min.js
|
||||
lspDATA=lsp/header.html lsp/main.css lsp/footer.html
|
||||
|
||||
JAVA := $(shell which java 2> /dev/null)
|
||||
|
|
@ -201,7 +227,7 @@ clean:
|
|||
rm -f *.o Mist* sourcery src/controller/server.html src/connectors/embed.js.h src/controller/server.html.h
|
||||
rm -rf ./docs
|
||||
|
||||
install: controller buffers connectors analysers converters
|
||||
install: all
|
||||
install ./Mist* $(DESTDIR)$(bindir)
|
||||
|
||||
uninstall:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue