development-history/proxy.git

parent: 928db0d6 | 补丁 | 提交 | ignore whitespace

pans

2016-12-28 e0c7efb3817ee545c5be5caebc0aceb9594f65aa



git-svn-id: http://192.168.1.226/svn/proxy@47 454eff88-639b-444f-9e54-f578c98de674

1 文件已重命名

1个文件已修改

	RtspFace/demo/src/Makefile	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	RtspFace/demo/src/run.sh	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 RtspFace/demo/src/Makefile

@@ -11,7 +11,6 @@

demo: $(OBJ)
    $(CXX) $(CXXFLAGS) $(LDFLAGS) -o demo $(OBJ) $(LIBS)

main.o : test.cpp
    $(CXX) $(CXXFLAGS) $(LDFLAGS) -c test.cpp -o main.o 
faceAPI.o : faceAPI.h
@@ -21,4 +20,6 @@

.PHONY: clean
clean:
    rm -f *.o  demo
    rm -f *.o  demo
run :
    $(shell sh test.sh)

 RtspFace/demo/src/run.sh

File was renamed from RtspFace/demo/test.sh
@@ -1,4 +1,2 @@
#!/bin/bash
cd /src/
make
LD_LIBRARY_PATH=../libs/lib_dummy ./demo
LD_LIBRARY_PATH=../libs/lib_dummy ./demo

			@@ -11,7 +11,6 @@

			demo: $(OBJ)
			$(CXX) $(CXXFLAGS) $(LDFLAGS) -o demo $(OBJ) $(LIBS)

			main.o : test.cpp
			$(CXX) $(CXXFLAGS) $(LDFLAGS) -c test.cpp -o main.o
			faceAPI.o : faceAPI.h
			@@ -21,4 +20,6 @@

			.PHONY: clean
			clean:
			rm -f *.o demo
			rm -f *.o demo
			run :
			$(shell sh test.sh)

File was renamed from RtspFace/demo/test.sh
			@@ -1,4 +1,2 @@
			#!/bin/bash
			cd /src/
			make
			LD_LIBRARY_PATH=../libs/lib_dummy ./demo
			LD_LIBRARY_PATH=../libs/lib_dummy ./demo