diff --git a/X64/makefile b/X64/makefile deleted file mode 100644 index 9a6b8c5e..00000000 --- a/X64/makefile +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - --include ../makefile.init - -RM := rm -rf - -# All of the sources participating in the build are defined here --include sources.mk --include test/subdir.mk --include src/Shell/subdir.mk --include src/Rtsp/subdir.mk --include src/Rtmp/subdir.mk --include src/RTP/subdir.mk --include src/Player/subdir.mk --include src/MediaFile/subdir.mk --include src/Http/subdir.mk --include src/H264/subdir.mk --include src/Device/subdir.mk --include src/Common/subdir.mk --include src/Codec/subdir.mk --include subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(CC_DEPS)),) --include $(CC_DEPS) -endif -ifneq ($(strip $(C++_DEPS)),) --include $(C++_DEPS) -endif -ifneq ($(strip $(C_UPPER_DEPS)),) --include $(C_UPPER_DEPS) -endif -ifneq ($(strip $(CXX_DEPS)),) --include $(CXX_DEPS) -endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -ifneq ($(strip $(CPP_DEPS)),) --include $(CPP_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: libZLMediaKit.so - -# Tool invocations -libZLMediaKit.so: $(OBJS) $(USER_OBJS) - @echo 'Building target: $@' - @echo 'Invoking: Cross G++ Linker' - g++ -shared -o "libZLMediaKit.so" $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - -# Other Targets -clean: - -$(RM) $(LIBRARIES)$(CC_DEPS)$(C++_DEPS)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(C_DEPS)$(CPP_DEPS) libZLMediaKit.so - -@echo ' ' - -.PHONY: all clean dependents -.SECONDARY: - --include ../makefile.targets diff --git a/X64/objects.mk b/X64/objects.mk deleted file mode 100644 index 742c2da0..00000000 --- a/X64/objects.mk +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -USER_OBJS := - -LIBS := - diff --git a/X64/sources.mk b/X64/sources.mk deleted file mode 100644 index a9c5d95c..00000000 --- a/X64/sources.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -C_UPPER_SRCS := -CXX_SRCS := -C++_SRCS := -OBJ_SRCS := -CC_SRCS := -ASM_SRCS := -C_SRCS := -CPP_SRCS := -O_SRCS := -S_UPPER_SRCS := -LIBRARIES := -CC_DEPS := -C++_DEPS := -OBJS := -C_UPPER_DEPS := -CXX_DEPS := -C_DEPS := -CPP_DEPS := - -# Every subdirectory with source files must be described here -SUBDIRS := \ -src/Codec \ -src/Common \ -src/Device \ -src/H264 \ -src/Http \ -src/MediaFile \ -src/Player \ -src/RTP \ -src/Rtmp \ -src/Rtsp \ -src/Shell \ -test \ - diff --git a/X64/src/Codec/subdir.mk b/X64/src/Codec/subdir.mk deleted file mode 100644 index 3055ec4a..00000000 --- a/X64/src/Codec/subdir.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/Codec/AACEncoder.cpp \ -../src/Codec/H264Encoder.cpp - -OBJS += \ -./src/Codec/AACEncoder.o \ -./src/Codec/H264Encoder.o - -CPP_DEPS += \ -./src/Codec/AACEncoder.d \ -./src/Codec/H264Encoder.d - - -# Each subdirectory must supply rules for building sources it contributes -src/Codec/%.o: ../src/Codec/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/Device/subdir.mk b/X64/src/Device/subdir.mk deleted file mode 100644 index 8de402f4..00000000 --- a/X64/src/Device/subdir.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/Device/Device.cpp \ -../src/Device/PlayerProxy.cpp \ -../src/Device/base64.cpp - -OBJS += \ -./src/Device/Device.o \ -./src/Device/PlayerProxy.o \ -./src/Device/base64.o - -CPP_DEPS += \ -./src/Device/Device.d \ -./src/Device/PlayerProxy.d \ -./src/Device/base64.d - - -# Each subdirectory must supply rules for building sources it contributes -src/Device/%.o: ../src/Device/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/H264/subdir.mk b/X64/src/H264/subdir.mk deleted file mode 100644 index ce551c31..00000000 --- a/X64/src/H264/subdir.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -C_SRCS += \ -../src/H264/SPSParser.c - -CPP_SRCS += \ -../src/H264/H264Parser.cpp \ -../src/H264/h264_bit_reader.cpp \ -../src/H264/h264_parser.cpp \ -../src/H264/h264_poc.cpp \ -../src/H264/ranges.cpp - -OBJS += \ -./src/H264/H264Parser.o \ -./src/H264/SPSParser.o \ -./src/H264/h264_bit_reader.o \ -./src/H264/h264_parser.o \ -./src/H264/h264_poc.o \ -./src/H264/ranges.o - -C_DEPS += \ -./src/H264/SPSParser.d - -CPP_DEPS += \ -./src/H264/H264Parser.d \ -./src/H264/h264_bit_reader.d \ -./src/H264/h264_parser.d \ -./src/H264/h264_poc.d \ -./src/H264/ranges.d - - -# Each subdirectory must supply rules for building sources it contributes -src/H264/%.o: ../src/H264/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - -src/H264/%.o: ../src/H264/%.c - @echo 'Building file: $<' - @echo 'Invoking: Cross GCC Compiler' - gcc -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/Http/subdir.mk b/X64/src/Http/subdir.mk deleted file mode 100644 index bfd4cee8..00000000 --- a/X64/src/Http/subdir.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/Http/HttpSession.cpp \ -../src/Http/strCoding.cpp - -OBJS += \ -./src/Http/HttpSession.o \ -./src/Http/strCoding.o - -CPP_DEPS += \ -./src/Http/HttpSession.d \ -./src/Http/strCoding.d - - -# Each subdirectory must supply rules for building sources it contributes -src/Http/%.o: ../src/Http/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/MediaFile/subdir.mk b/X64/src/MediaFile/subdir.mk deleted file mode 100644 index 57b13075..00000000 --- a/X64/src/MediaFile/subdir.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/MediaFile/HLSMaker.cpp \ -../src/MediaFile/MediaReader.cpp \ -../src/MediaFile/MediaRecorder.cpp \ -../src/MediaFile/Mp4Maker.cpp \ -../src/MediaFile/TSMaker.cpp \ -../src/MediaFile/crc32.cpp - -OBJS += \ -./src/MediaFile/HLSMaker.o \ -./src/MediaFile/MediaReader.o \ -./src/MediaFile/MediaRecorder.o \ -./src/MediaFile/Mp4Maker.o \ -./src/MediaFile/TSMaker.o \ -./src/MediaFile/crc32.o - -CPP_DEPS += \ -./src/MediaFile/HLSMaker.d \ -./src/MediaFile/MediaReader.d \ -./src/MediaFile/MediaRecorder.d \ -./src/MediaFile/Mp4Maker.d \ -./src/MediaFile/TSMaker.d \ -./src/MediaFile/crc32.d - - -# Each subdirectory must supply rules for building sources it contributes -src/MediaFile/%.o: ../src/MediaFile/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/Player/subdir.mk b/X64/src/Player/subdir.mk deleted file mode 100644 index b7c078a5..00000000 --- a/X64/src/Player/subdir.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/Player/MediaPlayer.cpp \ -../src/Player/Player.cpp \ -../src/Player/PlayerBase.cpp - -OBJS += \ -./src/Player/MediaPlayer.o \ -./src/Player/Player.o \ -./src/Player/PlayerBase.o - -CPP_DEPS += \ -./src/Player/MediaPlayer.d \ -./src/Player/Player.d \ -./src/Player/PlayerBase.d - - -# Each subdirectory must supply rules for building sources it contributes -src/Player/%.o: ../src/Player/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/RTP/subdir.mk b/X64/src/RTP/subdir.mk deleted file mode 100644 index e12e8942..00000000 --- a/X64/src/RTP/subdir.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/RTP/RtpMakerAAC.cpp \ -../src/RTP/RtpMakerH264.cpp - -OBJS += \ -./src/RTP/RtpMakerAAC.o \ -./src/RTP/RtpMakerH264.o - -CPP_DEPS += \ -./src/RTP/RtpMakerAAC.d \ -./src/RTP/RtpMakerH264.d - - -# Each subdirectory must supply rules for building sources it contributes -src/RTP/%.o: ../src/RTP/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/Rtmp/subdir.mk b/X64/src/Rtmp/subdir.mk deleted file mode 100644 index bba3208f..00000000 --- a/X64/src/Rtmp/subdir.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/Rtmp/RtmpMediaSource.cpp \ -../src/Rtmp/RtmpParser.cpp \ -../src/Rtmp/RtmpPlayer.cpp \ -../src/Rtmp/RtmpPlayerImp.cpp \ -../src/Rtmp/RtmpProtocol.cpp \ -../src/Rtmp/RtmpPusher.cpp \ -../src/Rtmp/RtmpSession.cpp \ -../src/Rtmp/RtmpToRtspMediaSource.cpp \ -../src/Rtmp/amf.cpp \ -../src/Rtmp/utils.cpp - -OBJS += \ -./src/Rtmp/RtmpMediaSource.o \ -./src/Rtmp/RtmpParser.o \ -./src/Rtmp/RtmpPlayer.o \ -./src/Rtmp/RtmpPlayerImp.o \ -./src/Rtmp/RtmpProtocol.o \ -./src/Rtmp/RtmpPusher.o \ -./src/Rtmp/RtmpSession.o \ -./src/Rtmp/RtmpToRtspMediaSource.o \ -./src/Rtmp/amf.o \ -./src/Rtmp/utils.o - -CPP_DEPS += \ -./src/Rtmp/RtmpMediaSource.d \ -./src/Rtmp/RtmpParser.d \ -./src/Rtmp/RtmpPlayer.d \ -./src/Rtmp/RtmpPlayerImp.d \ -./src/Rtmp/RtmpProtocol.d \ -./src/Rtmp/RtmpPusher.d \ -./src/Rtmp/RtmpSession.d \ -./src/Rtmp/RtmpToRtspMediaSource.d \ -./src/Rtmp/amf.d \ -./src/Rtmp/utils.d - - -# Each subdirectory must supply rules for building sources it contributes -src/Rtmp/%.o: ../src/Rtmp/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/Rtsp/subdir.mk b/X64/src/Rtsp/subdir.mk deleted file mode 100644 index 52b9533f..00000000 --- a/X64/src/Rtsp/subdir.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/Rtsp/RtpBroadCaster.cpp \ -../src/Rtsp/RtpParser.cpp \ -../src/Rtsp/Rtsp.cpp \ -../src/Rtsp/RtspMediaSource.cpp \ -../src/Rtsp/RtspPlayer.cpp \ -../src/Rtsp/RtspPlayerImp.cpp \ -../src/Rtsp/RtspSession.cpp \ -../src/Rtsp/RtspToRtmpMediaSource.cpp \ -../src/Rtsp/UDPServer.cpp - -OBJS += \ -./src/Rtsp/RtpBroadCaster.o \ -./src/Rtsp/RtpParser.o \ -./src/Rtsp/Rtsp.o \ -./src/Rtsp/RtspMediaSource.o \ -./src/Rtsp/RtspPlayer.o \ -./src/Rtsp/RtspPlayerImp.o \ -./src/Rtsp/RtspSession.o \ -./src/Rtsp/RtspToRtmpMediaSource.o \ -./src/Rtsp/UDPServer.o - -CPP_DEPS += \ -./src/Rtsp/RtpBroadCaster.d \ -./src/Rtsp/RtpParser.d \ -./src/Rtsp/Rtsp.d \ -./src/Rtsp/RtspMediaSource.d \ -./src/Rtsp/RtspPlayer.d \ -./src/Rtsp/RtspPlayerImp.d \ -./src/Rtsp/RtspSession.d \ -./src/Rtsp/RtspToRtmpMediaSource.d \ -./src/Rtsp/UDPServer.d - - -# Each subdirectory must supply rules for building sources it contributes -src/Rtsp/%.o: ../src/Rtsp/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/Shell/subdir.mk b/X64/src/Shell/subdir.mk deleted file mode 100644 index ceb3819a..00000000 --- a/X64/src/Shell/subdir.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/Shell/CMD.cpp \ -../src/Shell/ShellSession.cpp - -OBJS += \ -./src/Shell/CMD.o \ -./src/Shell/ShellSession.o - -CPP_DEPS += \ -./src/Shell/CMD.d \ -./src/Shell/ShellSession.d - - -# Each subdirectory must supply rules for building sources it contributes -src/Shell/%.o: ../src/Shell/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/src/subdir.mk b/X64/src/subdir.mk deleted file mode 100644 index 55e8894d..00000000 --- a/X64/src/subdir.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../src/config.cpp - -OBJS += \ -./src/config.o - -CPP_DEPS += \ -./src/config.d - - -# Each subdirectory must supply rules for building sources it contributes -src/%.o: ../src/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/X64/test/subdir.mk b/X64/test/subdir.mk deleted file mode 100644 index ab58fa77..00000000 --- a/X64/test/subdir.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../test/DeviceHK.cpp \ -../test/test.cpp - -OBJS += \ -./test/DeviceHK.o \ -./test/test.o - -CPP_DEPS += \ -./test/DeviceHK.d \ -./test/test.d - - -# Each subdirectory must supply rules for building sources it contributes -test/%.o: ../test/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - g++ -std=c++1y -DENABLE_RTSP2RTMP -DENABLE_RTMP2RTSP -DENABLE_HLS -DENABLE_MP4V2 -DENABLE_FAAC -DENABLE_X264 -I"/home/xzl/git/ZLMediaKit/src" -I../../ZLToolKit/src -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - -