easyipcamera_rtsp linux编译

cc9b4954 · jinlong0603 · 9a7eb945 · cc9b4954 · cc9b4954 · cc9b4954
11 changed file
--- a/EasyIPCamera_RTSP/Buildit
+++ b/EasyIPCamera_RTSP/Buildit
+#!/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
--- 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:

--- 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:

--- a/EasyIPCamera_RTSP/nbproject/Makefile-i386.mk
+++ b/EasyIPCamera_RTSP/nbproject/Makefile-i386.mk
+#
+# 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
--- 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

--- 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
 #

--- a/EasyIPCamera_RTSP/nbproject/Makefile-x64.mk
+++ b/EasyIPCamera_RTSP/nbproject/Makefile-x64.mk
+#
+# 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
--- a/EasyIPCamera_RTSP/nbproject/configurations.xml
+++ b/EasyIPCamera_RTSP/nbproject/configurations.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="97">
+<configurationDescriptor version="100">
  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
    <logicalFolder name="HeaderFiles" displayName="头文件" projectFiles="true">
    </logicalFolder>
@@ -92,5 +92,85 @@
      <item path="main.cpp" ex="false" tool="1" flavor2="0">
      </item>
    </conf>
+    <conf name="x64" type="1">
+      <toolsSet>
+        <compilerSet>default</compilerSet>
+        <dependencyChecking>true</dependencyChecking>
+        <rebuildPropChanged>false</rebuildPropChanged>
+      </toolsSet>
+      <compileType>
+        <cTool>
+          <developmentMode>5</developmentMode>
+        </cTool>
+        <ccTool>
+          <developmentMode>5</developmentMode>
+          <incDir>
+            <pElem>libEasyRTSPClient/Include</pElem>
+            <pElem>../Include</pElem>
+          </incDir>
+        </ccTool>
+        <fortranCompilerTool>
+          <developmentMode>5</developmentMode>
+        </fortranCompilerTool>
+        <asmTool>
+          <developmentMode>5</developmentMode>
+        </asmTool>
+        <linkerTool>
+          <output>${CND_CONF}/easyipcamera_rtsp</output>
+          <linkerAddLib>
+            <pElem>../Lib/x64_shared</pElem>
+            <pElem>libEasyRTSPClient/Lib/x64</pElem>
+          </linkerAddLib>
+          <commandLine>-leasyrtspclient -leasyipcamera -lrt -lpthread</commandLine>
+        </linkerTool>
+      </compileType>
+      <item path="GetVPSSPSPPS.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="GetVPSSPSPPS.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="main.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+    </conf>
+    <conf name="i386" type="1">
+      <toolsSet>
+        <compilerSet>default</compilerSet>
+        <dependencyChecking>true</dependencyChecking>
+        <rebuildPropChanged>false</rebuildPropChanged>
+      </toolsSet>
+      <compileType>
+        <cTool>
+          <developmentMode>5</developmentMode>
+          <commandLine>-m32</commandLine>
+        </cTool>
+        <ccTool>
+          <developmentMode>5</developmentMode>
+          <incDir>
+            <pElem>libEasyRTSPClient/Include</pElem>
+            <pElem>../Include</pElem>
+          </incDir>
+          <commandLine>-m32</commandLine>
+        </ccTool>
+        <fortranCompilerTool>
+          <developmentMode>5</developmentMode>
+        </fortranCompilerTool>
+        <asmTool>
+          <developmentMode>5</developmentMode>
+        </asmTool>
+        <linkerTool>
+          <output>${CND_CONF}/easyipcamera_rtsp</output>
+          <linkerAddLib>
+            <pElem>../Lib/${CND_CONF}_shared</pElem>
+            <pElem>libEasyRTSPClient/Lib/${CND_CONF}</pElem>
+          </linkerAddLib>
+          <commandLine>-leasyrtspclient -leasyipcamera -lrt -lpthread</commandLine>
+        </linkerTool>
+      </compileType>
+      <item path="GetVPSSPSPPS.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="GetVPSSPSPPS.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="main.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+    </conf>
  </confs>
 </configurationDescriptor>
--- a/EasyIPCamera_RTSP/nbproject/project.xml
+++ b/EasyIPCamera_RTSP/nbproject/project.xml
@@ -19,6 +19,14 @@
                    <name>Release</name>
                    <type>1</type>
                </confElem>
+                <confElem>
+                    <name>x64</name>
+                    <type>1</type>
+                </confElem>
+                <confElem>
+                    <name>i386</name>
+                    <type>1</type>
+                </confElem>
            </confList>
            <formatting>
                <project-formatting-style>false</project-formatting-style>

--- a/Lib/i386_shared/libeasyipcamera.so
+++ b/Lib/i386_shared/libeasyipcamera.so
--- a/Lib/x64_shared/libeasyipcamera.so
+++ b/Lib/x64_shared/libeasyipcamera.so