From 4bdf96bd6aafbec6bc3f0eab8739d6652878fd24 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 06 Dec 2013 21:26:09 +0000
Subject: [PATCH] New data format

---
 Makefile |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bf7cfd3..e1238d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,17 @@
 CC=gcc
-CFLAGS=-Wall `pkg-config --cflags opencv` -O3 -flto -ffast-math
-CFLAGS=-Wall `pkg-config --cflags opencv` -O0 -g
+COMMON=-Wall `pkg-config --cflags opencv`
+UNAME = $(shell uname)
+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
+endif
+CFLAGS= $(COMMON) -O3 -ffast-math -flto
+#CFLAGS= $(COMMON) -O0 -g 
 LDFLAGS=`pkg-config --libs opencv` -lm
 VPATH=./src/
 
-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
+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
 
 all: cnn
 

--
Gitblit v1.10.0