From 2ea63c0e99a5358eaf38785ea83b9c5923fcc9cd Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 13 Mar 2014 04:57:34 +0000
Subject: [PATCH] Better VOC handling and resizing

---
 Makefile |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e1238d6..a02d7ef 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,19 @@
 ifeq ($(UNAME), Darwin)
 COMMON += -isystem /usr/local/Cellar/opencv/2.4.6.1/include/opencv -isystem /usr/local/Cellar/opencv/2.4.6.1/include
 else
-COMMON += -march=native
+COMMON += -march=native -flto
 endif
-CFLAGS= $(COMMON) -O3 -ffast-math -flto
+CFLAGS= $(COMMON) -Ofast
 #CFLAGS= $(COMMON) -O0 -g 
 LDFLAGS=`pkg-config --libs opencv` -lm
 VPATH=./src/
+EXEC=cnn
 
-OBJ=network.o image.o tests.o convolutional_layer.o connected_layer.o maxpool_layer.o activations.o list.o option_list.o parser.o utils.o data.o matrix.o softmax_layer.o
+OBJ=network.o image.o tests.o connected_layer.o maxpool_layer.o activations.o list.o option_list.o parser.o utils.o data.o matrix.o softmax_layer.o mini_blas.o convolutional_layer.o
 
-all: cnn
+all: $(EXEC)
 
-cnn: $(OBJ)
+$(EXEC): $(OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
 %.o: %.c 
@@ -24,5 +25,5 @@
 .PHONY: clean
 
 clean:
-	rm -rf $(OBJ) cnn
+	rm -rf $(OBJ) $(EXEC)
 

--
Gitblit v1.10.0