修复linux i386编译问题

EasyDarwin · Mar 16, 2017 · ed9269f · ed9269f
1 parent 65cc03e
commit ed9269f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk
@@ -21,7 +21,7 @@ FC=gfortran
 AS=as
 
 # Macros
-CND_PLATFORM=GNU-Linux-x86
+CND_PLATFORM=GNU-Linux
 CND_DLIB_EXT=so
 CND_CONF=Debug
 CND_DISTDIR=dist
@@ -62,7 +62,7 @@ ${CND_CONF}/easyrtspclient: ${OBJECTFILES}
 	${MKDIR} -p ${CND_CONF}
 	${LINK.cc} -o ${CND_CONF}/easyrtspclient ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -lpthread
 
-${OBJECTDIR}/main.o: main.cpp 
+${OBJECTDIR}/main.o: main.cpp
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
 	$(COMPILE.cc) -g -IInclude -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp
@@ -73,7 +73,6 @@ ${OBJECTDIR}/main.o: main.cpp
 # Clean Targets
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ${CND_CONF}/easyrtspclient
 
 # Subprojects
 .clean-subprojects:

diff --git a/nbproject/Makefile-i386.mk b/nbproject/Makefile-i386.mk
@@ -21,7 +21,7 @@ FC=gfortran
 AS=as
 
 # Macros
-CND_PLATFORM=GNU-Linux-x86
+CND_PLATFORM=GNU-Linux
 CND_DLIB_EXT=so
 CND_CONF=i386
 CND_DISTDIR=dist
@@ -52,17 +52,17 @@ FFLAGS=
 ASFLAGS=
 
 # Link Libraries and Options
-LDLIBSOPTIONS=-LLib
+LDLIBSOPTIONS=-LLib/${CND_CONF}
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
 	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_CONF}/easyrtspclient
 
 ${CND_CONF}/easyrtspclient: ${OBJECTFILES}
 	${MKDIR} -p ${CND_CONF}
-	${LINK.cc} -o ${CND_CONF}/easyrtspclient ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -lpthread -lrt
+	${LINK.cc} -o ${CND_CONF}/easyrtspclient ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -lpthread
 
-${OBJECTDIR}/main.o: main.cpp 
+${OBJECTDIR}/main.o: main.cpp
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
 	$(COMPILE.cc) -O2 -IInclude -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp
@@ -73,7 +73,6 @@ ${OBJECTDIR}/main.o: main.cpp
 # Clean Targets
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ${CND_CONF}/easyrtspclient
 
 # Subprojects
 .clean-subprojects:

diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk
@@ -76,7 +76,7 @@ ALLCONFS=Debug i386 x64
 .depcheck-impl:
 	@echo "# This code depends on make tool being used" >.dep.inc
 	@if [ -n "${MAKE_VERSION}" ]; then \
-	    echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
+	    echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES} \$${TESTOBJECTFILES}))" >>.dep.inc; \
 	    echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
 	    echo "include \$${DEPFILES}" >>.dep.inc; \
 	    echo "endif" >>.dep.inc; \

diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk
@@ -7,29 +7,29 @@ CND_BASEDIR=`pwd`
 CND_BUILDDIR=build
 CND_DISTDIR=dist
 # Debug configuration
-CND_PLATFORM_Debug=GNU-Linux-x86
+CND_PLATFORM_Debug=GNU-Linux
 CND_ARTIFACT_DIR_Debug=Debug
 CND_ARTIFACT_NAME_Debug=easyrtspclient
 CND_ARTIFACT_PATH_Debug=Debug/easyrtspclient
-CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux-x86/package
+CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux/package
 CND_PACKAGE_NAME_Debug=easyrtspclient.tar
-CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux-x86/package/easyrtspclient.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux/package/easyrtspclient.tar
 # i386 configuration
-CND_PLATFORM_i386=GNU-Linux-x86
+CND_PLATFORM_i386=GNU-Linux
 CND_ARTIFACT_DIR_i386=i386
 CND_ARTIFACT_NAME_i386=easyrtspclient
 CND_ARTIFACT_PATH_i386=i386/easyrtspclient
-CND_PACKAGE_DIR_i386=dist/i386/GNU-Linux-x86/package
+CND_PACKAGE_DIR_i386=dist/i386/GNU-Linux/package
 CND_PACKAGE_NAME_i386=easyrtspclient.tar
-CND_PACKAGE_PATH_i386=dist/i386/GNU-Linux-x86/package/easyrtspclient.tar
+CND_PACKAGE_PATH_i386=dist/i386/GNU-Linux/package/easyrtspclient.tar
 # x64 configuration
-CND_PLATFORM_x64=GNU-Linux-x86
+CND_PLATFORM_x64=GNU-Linux
 CND_ARTIFACT_DIR_x64=x64
 CND_ARTIFACT_NAME_x64=easyrtspclient
 CND_ARTIFACT_PATH_x64=x64/easyrtspclient
-CND_PACKAGE_DIR_x64=dist/x64/GNU-Linux-x86/package
+CND_PACKAGE_DIR_x64=dist/x64/GNU-Linux/package
 CND_PACKAGE_NAME_x64=easyrtspclient.tar
-CND_PACKAGE_PATH_x64=dist/x64/GNU-Linux-x86/package/easyrtspclient.tar
+CND_PACKAGE_PATH_x64=dist/x64/GNU-Linux/package/easyrtspclient.tar
 #
 # include compiler specific variables
 #

diff --git a/nbproject/Makefile-x64.mk b/nbproject/Makefile-x64.mk
@@ -21,7 +21,7 @@ FC=gfortran
 AS=as
 
 # Macros
-CND_PLATFORM=GNU-Linux-x86
+CND_PLATFORM=GNU-Linux
 CND_DLIB_EXT=so
 CND_CONF=x64
 CND_DISTDIR=dist
@@ -60,9 +60,9 @@ LDLIBSOPTIONS=-LLib/${CND_CONF}
 
 ${CND_CONF}/easyrtspclient: ${OBJECTFILES}
 	${MKDIR} -p ${CND_CONF}
-	${LINK.cc} -o ${CND_CONF}/easyrtspclient ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -lpthread -lrt
+	${LINK.cc} -o ${CND_CONF}/easyrtspclient ${OBJECTFILES} ${LDLIBSOPTIONS} -leasyrtspclient -lpthread
 
-${OBJECTDIR}/main.o: main.cpp 
+${OBJECTDIR}/main.o: main.cpp
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
 	$(COMPILE.cc) -O2 -IInclude -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp
@@ -73,7 +73,6 @@ ${OBJECTDIR}/main.o: main.cpp
 # Clean Targets
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ${CND_CONF}/easyrtspclient
 
 # Subprojects
 .clean-subprojects:

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="95">
+<configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <logicalFolder name="HeaderFiles" displayName="头文件" projectFiles="true">
     </logicalFolder>
@@ -71,7 +71,7 @@
         <linkerTool>
           <output>${CND_CONF}/easyrtspclient</output>
           <linkerAddLib>
-            <pElem>Lib</pElem>
+            <pElem>Lib/${CND_CONF}</pElem>
           </linkerAddLib>
           <commandLine>-leasyrtspclient -lpthread</commandLine>
         </linkerTool>