change makefile

kangyizhang · Mar 31, 2014 · 9115a76 · 9115a76
1 parent e58bc12
commit 9115a76
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/cv/Makefile b/cv/Makefile
@@ -1,5 +1,9 @@
 
 
 
-cv: cv.cpp
-	g++ cv.cpp -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_objdetect -o cv
+main: cv.o main.o
+	g++ main.o cv.o -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_objdetect -o main
+main.o : main.cpp
+	g++ -g -c main.cpp 
+cv.o: cv.cpp
+	g++ -g -c cv.cpp
diff --git a/cv/cv.cpp b/cv/cv.cpp
@@ -1,20 +1,6 @@
 #include "cv.h"
 
 
-int main(int argc, char** argv){
-  char name[]="test window";
-  Mat image = Mat::zeros(WIDE,HEIGHT,CV_8UC3);
-  drawCircle(3,3,2,1,image);
-  imshow(name, image);
-  waitKey(0);
-  return 0;
-}
-
-
-
-
-
-
 
 void drawCircle(int mx, int my, int x, int y , Mat img ){
   int thickness = -1;

diff --git a/cv/cv.o b/cv/cv.o
diff --git a/cv/main b/cv/main
diff --git a/cv/main.cpp b/cv/main.cpp
@@ -0,0 +1,11 @@
+#include "cv.h"
+#include <stdio.h>
+
+int main(int argc, char** argv){
+  char name[]="test window";
+  Mat image = Mat::zeros(WIDE,HEIGHT,CV_8UC3);
+  drawCircle(3,3,2,1,image);
+  imshow(name, image);
+  waitKey(0);
+  return 0;
+}
diff --git a/cv/main.cpp~ b/cv/main.cpp~
@@ -0,0 +1,3 @@
+#include "cv.h"
+#include <stdio.h>
+
diff --git a/cv/main.o b/cv/main.o