UBB/sort
1
0
Fork 0
Code Issues Pull Requests Releases 3 Activity

resolve conflicts

Browse Source
This commit is contained in:
Chris Cromer
2018-11-17 11:55:26 -03:00
parent a91f3e2b59 bc9a6573da
commit e41b6e9b1b
9 changed files with 301 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,7 +1,7 @@
CC=gcc
CFLAGS=-Wall -Isrc/include -DDEBUG -g
#LDFLAGS=-lm
SRC=src/sort.c src/random.c src/bubble_sort.c src/timer.c src/count_sort.c src/quick_sort.c src/bitonic_sort.c src/selection_sort.c
SRC=src/sort.c src/random.c src/bubble_sort.c src/timer.c src/count_sort.c src/quick_sort.c src/merge_sort.c src/bitonic_sort.c src/selection_sort.c
OBJ=$(SRC:.c=.o)
all: sort informe