diff --git a/EasyIPCamera_RTSP/Buildit b/EasyIPCamera_RTSP/Buildit new file mode 100644 index 0000000000000000000000000000000000000000..5d2d1b6825b55446d3ea4f60daecc24b7d0ff807 --- /dev/null +++ b/EasyIPCamera_RTSP/Buildit @@ -0,0 +1,19 @@ +#!/bin/sh + +usage() +{ + echo "0. clean up ./Buildit clean" + echo "1. build 32bit program ./Buildit i386" + echo "2. build 64bit program ./Buildit x64" +} + +if [ "$*" = "clean" ] ; then + make -f nbproject/Makefile-i386.mk QMAKE= SUBPROJECTS= .clean-conf + make -f nbproject/Makefile-x64.mk QMAKE= SUBPROJECTS= .clean-conf +elif [ "$*" = "i386" ] ; then + make -f nbproject/Makefile-i386.mk QMAKE= SUBPROJECTS= .build-conf +elif [ "$*" = "x64" ] ; then + make -f nbproject/Makefile-x64.mk QMAKE= SUBPROJECTS= .build-conf +else + usage; +fi diff --git a/EasyIPCamera_RTSP/nbproject/Makefile-Debug.mk b/EasyIPCamera_RTSP/nbproject/Makefile-Debug.mk index 805c69aa326aa0112cea41b55843d0e90cf398de..7795f7a5f6aaa53be0163d32c130dc07fecb7fbc 100644 --- a/EasyIPCamera_RTSP/nbproject/Makefile-Debug.mk +++ b/EasyIPCamera_RTSP/nbproject/Makefile-Debug.mk @@ -63,12 +63,12 @@ ${CND_CONF}/easyipcamera_rtsp: ${OBJECTFILES} ${MKDIR} -p ${CND_CONF} ${LINK.cc} -o ${CND_CONF}/easyipcamera_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -leasyipcamera -lrt -lpthread -${OBJECTDIR}/GetVPSSPSPPS.o: GetVPSSPSPPS.cpp +${OBJECTDIR}/GetVPSSPSPPS.o: GetVPSSPSPPS.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -g -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetVPSSPSPPS.o GetVPSSPSPPS.cpp -${OBJECTDIR}/main.o: main.cpp +${OBJECTDIR}/main.o: main.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -g -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp @@ -79,7 +79,6 @@ ${OBJECTDIR}/main.o: main.cpp # Clean Targets .clean-conf: ${CLEAN_SUBPROJECTS} ${RM} -r ${CND_BUILDDIR}/${CND_CONF} - ${RM} ${CND_CONF}/easyipcamera_rtsp # Subprojects .clean-subprojects: diff --git a/EasyIPCamera_RTSP/nbproject/Makefile-Release.mk b/EasyIPCamera_RTSP/nbproject/Makefile-Release.mk index a8bf292c8d595341164494d892248503401d4ade..ac1f2e9d2c7593f38f2e09b602458c6074c10bf7 100644 --- a/EasyIPCamera_RTSP/nbproject/Makefile-Release.mk +++ b/EasyIPCamera_RTSP/nbproject/Makefile-Release.mk @@ -63,12 +63,12 @@ ${CND_CONF}/easyipcamera_rtsp: ${OBJECTFILES} ${MKDIR} -p ${CND_CONF} ${LINK.cc} -o ${CND_CONF}/easyipcamera_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -leasyipcamera -lrt -lpthread -${OBJECTDIR}/GetVPSSPSPPS.o: GetVPSSPSPPS.cpp +${OBJECTDIR}/GetVPSSPSPPS.o: GetVPSSPSPPS.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetVPSSPSPPS.o GetVPSSPSPPS.cpp -${OBJECTDIR}/main.o: main.cpp +${OBJECTDIR}/main.o: main.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp @@ -79,7 +79,6 @@ ${OBJECTDIR}/main.o: main.cpp # Clean Targets .clean-conf: ${CLEAN_SUBPROJECTS} ${RM} -r ${CND_BUILDDIR}/${CND_CONF} - ${RM} ${CND_CONF}/easyipcamera_rtsp # Subprojects .clean-subprojects: diff --git a/EasyIPCamera_RTSP/nbproject/Makefile-i386.mk b/EasyIPCamera_RTSP/nbproject/Makefile-i386.mk new file mode 100644 index 0000000000000000000000000000000000000000..9c10ed435c910f1db4017c09bacc0f5aa074b491 --- /dev/null +++ b/EasyIPCamera_RTSP/nbproject/Makefile-i386.mk @@ -0,0 +1,89 @@ +# +# Generated Makefile - do not edit! +# +# Edit the Makefile in the project folder instead (../Makefile). Each target +# has a -pre and a -post target defined where you can add customized code. +# +# This makefile implements configuration specific macros and targets. + + +# Environment +MKDIR=mkdir +CP=cp +GREP=grep +NM=nm +CCADMIN=CCadmin +RANLIB=ranlib +CC=gcc +CCC=g++ +CXX=g++ +FC=gfortran +AS=as + +# Macros +CND_PLATFORM=GNU-Linux +CND_DLIB_EXT=so +CND_CONF=i386 +CND_DISTDIR=dist +CND_BUILDDIR=build + +# Include project Makefile +include Makefile + +# Object Directory +OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} + +# Object Files +OBJECTFILES= \ + ${OBJECTDIR}/GetVPSSPSPPS.o \ + ${OBJECTDIR}/main.o + + +# C Compiler Flags +CFLAGS=-m32 + +# CC Compiler Flags +CCFLAGS=-m32 +CXXFLAGS=-m32 + +# Fortran Compiler Flags +FFLAGS= + +# Assembler Flags +ASFLAGS= + +# Link Libraries and Options +LDLIBSOPTIONS=-L../Lib/${CND_CONF}_shared -LlibEasyRTSPClient/Lib/${CND_CONF} + +# Build Targets +.build-conf: ${BUILD_SUBPROJECTS} + "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_CONF}/easyipcamera_rtsp + +${CND_CONF}/easyipcamera_rtsp: ${OBJECTFILES} + ${MKDIR} -p ${CND_CONF} + ${LINK.cc} -o ${CND_CONF}/easyipcamera_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -leasyipcamera -lrt -lpthread + +${OBJECTDIR}/GetVPSSPSPPS.o: GetVPSSPSPPS.cpp + ${MKDIR} -p ${OBJECTDIR} + ${RM} "$@.d" + $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetVPSSPSPPS.o GetVPSSPSPPS.cpp + +${OBJECTDIR}/main.o: main.cpp + ${MKDIR} -p ${OBJECTDIR} + ${RM} "$@.d" + $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp + +# Subprojects +.build-subprojects: + +# Clean Targets +.clean-conf: ${CLEAN_SUBPROJECTS} + ${RM} -r ${CND_BUILDDIR}/${CND_CONF} + +# Subprojects +.clean-subprojects: + +# Enable dependency checking +.dep.inc: .depcheck-impl + +include .dep.inc diff --git a/EasyIPCamera_RTSP/nbproject/Makefile-impl.mk b/EasyIPCamera_RTSP/nbproject/Makefile-impl.mk index af6264833b0731fb39ade0d6afe125e94f801410..bac70c237bbb83f16b2432bba7ec8df673075fe9 100644 --- a/EasyIPCamera_RTSP/nbproject/Makefile-impl.mk +++ b/EasyIPCamera_RTSP/nbproject/Makefile-impl.mk @@ -31,7 +31,7 @@ DEFAULTCONF=Debug CONF=${DEFAULTCONF} # All Configurations -ALLCONFS=Debug Release +ALLCONFS=Debug Release x64 i386 # build diff --git a/EasyIPCamera_RTSP/nbproject/Makefile-variables.mk b/EasyIPCamera_RTSP/nbproject/Makefile-variables.mk index 8d61409e141cf75264cfd4fc8e77fdac4fd63e7d..4007efc930b0486c4b96d9b4af0a77129e455a12 100644 --- a/EasyIPCamera_RTSP/nbproject/Makefile-variables.mk +++ b/EasyIPCamera_RTSP/nbproject/Makefile-variables.mk @@ -22,6 +22,22 @@ CND_ARTIFACT_PATH_Release=Release/easyipcamera_rtsp CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package CND_PACKAGE_NAME_Release=easyipcamerartsp.tar CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/easyipcamerartsp.tar +# x64 configuration +CND_PLATFORM_x64=GNU-Linux +CND_ARTIFACT_DIR_x64=x64 +CND_ARTIFACT_NAME_x64=easyipcamera_rtsp +CND_ARTIFACT_PATH_x64=x64/easyipcamera_rtsp +CND_PACKAGE_DIR_x64=dist/x64/GNU-Linux/package +CND_PACKAGE_NAME_x64=easyipcamerartsp.tar +CND_PACKAGE_PATH_x64=dist/x64/GNU-Linux/package/easyipcamerartsp.tar +# i386 configuration +CND_PLATFORM_i386=GNU-Linux +CND_ARTIFACT_DIR_i386=i386 +CND_ARTIFACT_NAME_i386=easyipcamera_rtsp +CND_ARTIFACT_PATH_i386=i386/easyipcamera_rtsp +CND_PACKAGE_DIR_i386=dist/i386/GNU-Linux/package +CND_PACKAGE_NAME_i386=easyipcamerartsp.tar +CND_PACKAGE_PATH_i386=dist/i386/GNU-Linux/package/easyipcamerartsp.tar # # include compiler specific variables # diff --git a/EasyIPCamera_RTSP/nbproject/Makefile-x64.mk b/EasyIPCamera_RTSP/nbproject/Makefile-x64.mk new file mode 100644 index 0000000000000000000000000000000000000000..497ad846f01f86a1fe8e316835e8357fbc7cd7f9 --- /dev/null +++ b/EasyIPCamera_RTSP/nbproject/Makefile-x64.mk @@ -0,0 +1,89 @@ +# +# Generated Makefile - do not edit! +# +# Edit the Makefile in the project folder instead (../Makefile). Each target +# has a -pre and a -post target defined where you can add customized code. +# +# This makefile implements configuration specific macros and targets. + + +# Environment +MKDIR=mkdir +CP=cp +GREP=grep +NM=nm +CCADMIN=CCadmin +RANLIB=ranlib +CC=gcc +CCC=g++ +CXX=g++ +FC=gfortran +AS=as + +# Macros +CND_PLATFORM=GNU-Linux +CND_DLIB_EXT=so +CND_CONF=x64 +CND_DISTDIR=dist +CND_BUILDDIR=build + +# Include project Makefile +include Makefile + +# Object Directory +OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM} + +# Object Files +OBJECTFILES= \ + ${OBJECTDIR}/GetVPSSPSPPS.o \ + ${OBJECTDIR}/main.o + + +# C Compiler Flags +CFLAGS= + +# CC Compiler Flags +CCFLAGS= +CXXFLAGS= + +# Fortran Compiler Flags +FFLAGS= + +# Assembler Flags +ASFLAGS= + +# Link Libraries and Options +LDLIBSOPTIONS=-L../Lib/x64_shared -LlibEasyRTSPClient/Lib/x64 + +# Build Targets +.build-conf: ${BUILD_SUBPROJECTS} + "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_CONF}/easyipcamera_rtsp + +${CND_CONF}/easyipcamera_rtsp: ${OBJECTFILES} + ${MKDIR} -p ${CND_CONF} + ${LINK.cc} -o ${CND_CONF}/easyipcamera_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -leasyipcamera -lrt -lpthread + +${OBJECTDIR}/GetVPSSPSPPS.o: GetVPSSPSPPS.cpp + ${MKDIR} -p ${OBJECTDIR} + ${RM} "$@.d" + $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/GetVPSSPSPPS.o GetVPSSPSPPS.cpp + +${OBJECTDIR}/main.o: main.cpp + ${MKDIR} -p ${OBJECTDIR} + ${RM} "$@.d" + $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp + +# Subprojects +.build-subprojects: + +# Clean Targets +.clean-conf: ${CLEAN_SUBPROJECTS} + ${RM} -r ${CND_BUILDDIR}/${CND_CONF} + +# Subprojects +.clean-subprojects: + +# Enable dependency checking +.dep.inc: .depcheck-impl + +include .dep.inc diff --git a/EasyIPCamera_RTSP/nbproject/configurations.xml b/EasyIPCamera_RTSP/nbproject/configurations.xml index b2c41ebbf997833d1830284839f6c457e7b7a327..ff6c2c72890b8b5564811f5a3b5e6d6b511901b5 100644 --- a/EasyIPCamera_RTSP/nbproject/configurations.xml +++ b/EasyIPCamera_RTSP/nbproject/configurations.xml @@ -1,5 +1,5 @@ - + @@ -92,5 +92,85 @@ + + + default + true + false + + + + 5 + + + 5 + + libEasyRTSPClient/Include + ../Include + + + + 5 + + + 5 + + + ${CND_CONF}/easyipcamera_rtsp + + ../Lib/x64_shared + libEasyRTSPClient/Lib/x64 + + -leasyrtspclient -leasyipcamera -lrt -lpthread + + + + + + + + + + + + default + true + false + + + + 5 + -m32 + + + 5 + + libEasyRTSPClient/Include + ../Include + + -m32 + + + 5 + + + 5 + + + ${CND_CONF}/easyipcamera_rtsp + + ../Lib/${CND_CONF}_shared + libEasyRTSPClient/Lib/${CND_CONF} + + -leasyrtspclient -leasyipcamera -lrt -lpthread + + + + + + + + + diff --git a/EasyIPCamera_RTSP/nbproject/project.xml b/EasyIPCamera_RTSP/nbproject/project.xml index a5d0a6af91f77cff590353830f139253abb5f21b..27434aa686de0176beecba532d246cb2101ad96f 100644 --- a/EasyIPCamera_RTSP/nbproject/project.xml +++ b/EasyIPCamera_RTSP/nbproject/project.xml @@ -19,6 +19,14 @@ Release 1 + + x64 + 1 + + + i386 + 1 + false diff --git a/Lib/i386_shared/libeasyipcamera.so b/Lib/i386_shared/libeasyipcamera.so new file mode 100644 index 0000000000000000000000000000000000000000..66d90dbd086328e95d5ccb25d14057bc23e0595f Binary files /dev/null and b/Lib/i386_shared/libeasyipcamera.so differ diff --git a/Lib/x64_shared/libeasyipcamera.so b/Lib/x64_shared/libeasyipcamera.so new file mode 100644 index 0000000000000000000000000000000000000000..4590959336c8d9f7b821914c4cc1ee5cf91aa43a Binary files /dev/null and b/Lib/x64_shared/libeasyipcamera.so differ