diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-24 18:23:42 +0200 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-04-24 18:23:42 +0200 |
| commit | 25333a9167fb26ae3850cb891facd024248e2ab2 (patch) | |
| tree | b0ce9f7f2b7c31936bc6116cf947ffc66157c198 | |
| parent | You fucktard (diff) | |
| download | 42-cub3d-25333a9167fb26ae3850cb891facd024248e2ab2.tar.gz 42-cub3d-25333a9167fb26ae3850cb891facd024248e2ab2.tar.bz2 42-cub3d-25333a9167fb26ae3850cb891facd024248e2ab2.tar.xz 42-cub3d-25333a9167fb26ae3850cb891facd024248e2ab2.tar.zst 42-cub3d-25333a9167fb26ae3850cb891facd024248e2ab2.zip | |
Back to clang
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | libft/Makefile | 12 | ||||
| -rw-r--r-- | minilibx-linux/Makefile.gen | 2 | ||||
| -rw-r--r-- | minilibx-linux/Makefile.mk | 2 | ||||
| -rw-r--r-- | minilibx-linux/test/Makefile.gen | 2 | ||||
| -rw-r--r-- | minilibx-linux/test/Makefile.mk | 2 | ||||
| -rw-r--r-- | src/ft_exit.c | 3 |
7 files changed, 9 insertions, 26 deletions
@@ -160,18 +160,10 @@ endif #==================================================================================================# #------------------------------------------ Compiler ----------------------------------------------# #==================================================================================================# -ifeq (${OS}, Linux) - DBG = -ggdb -else - DBG = -glldb -endif +DBG = -glldb FSANITIZE = -fsanitize=address #--------------------------------------------------------------------------------------------------# -ifeq (${OS}, Linux) - CC = gcc -else - CC = clang -endif +CC = clang #--------------------------------------------------------------------------------------------------# CFLAGS = -std=c89 CFLAGS += -Wall diff --git a/libft/Makefile b/libft/Makefile index 2bd6342..8ad24a7 100644 --- a/libft/Makefile +++ b/libft/Makefile @@ -118,18 +118,10 @@ OS = $(shell uname) #==============================================================================# #-------------------------------- Compiler ------------------------------------# #==============================================================================# -ifeq (${OS}, Linux) - DBG = -ggdb -else - DBG = -glldb -endif +DBG = -glldb FSANITIZE = -fsanitize=address #------------------------------------------------------------------------------# -ifeq (${OS}, Linux) - CC = gcc -else - CC = clang -endif +CC = clang #------------------------------------------------------------------------------# CFLAGS = -std=c89 CFLAGS += -Wall diff --git a/minilibx-linux/Makefile.gen b/minilibx-linux/Makefile.gen index a96eb91..f1b7b36 100644 --- a/minilibx-linux/Makefile.gen +++ b/minilibx-linux/Makefile.gen @@ -15,7 +15,7 @@ DOCP=do_cp -CC = gcc +CC = clang NAME = libmlx.a diff --git a/minilibx-linux/Makefile.mk b/minilibx-linux/Makefile.mk index 4ebc26d..8aec9f8 100644 --- a/minilibx-linux/Makefile.mk +++ b/minilibx-linux/Makefile.mk @@ -15,7 +15,7 @@ INC =%%%% HT =%%%% DOCP =%%%% -CC = gcc +CC = clang NAME = libmlx.a diff --git a/minilibx-linux/test/Makefile.gen b/minilibx-linux/test/Makefile.gen index b31bdb4..87788e6 100644 --- a/minilibx-linux/test/Makefile.gen +++ b/minilibx-linux/test/Makefile.gen @@ -6,7 +6,7 @@ DOCP=do_cp INCLIB=$(INC)/../lib -CC=gcc +CC=clang CFLAGS= -I$(INC) -O3 -I.. diff --git a/minilibx-linux/test/Makefile.mk b/minilibx-linux/test/Makefile.mk index ca55cd3..0f53629 100644 --- a/minilibx-linux/test/Makefile.mk +++ b/minilibx-linux/test/Makefile.mk @@ -4,7 +4,7 @@ INC=%%%% INCLIB=$(INC)/../lib -CC=gcc +CC=clang CFLAGS= -I$(INC) -O3 -I.. diff --git a/src/ft_exit.c b/src/ft_exit.c index 729dda7..17b7087 100644 --- a/src/ft_exit.c +++ b/src/ft_exit.c @@ -55,9 +55,8 @@ static void system(FT_SND_TERM_CMD); } i = -1; - while (++i < FT_TOTAL_SFX) + while (clist->wlist.inited && ++i < FT_TOTAL_SFX) { - pthread_mutex_destroy(&clist->sfx[i].mutex); if (FT_OS == 2) { pthread_cancel(clist->sfx[i].tid); |