From 9e2486ed29a464d5ecbb27d02cb6dd71715356bb Mon Sep 17 00:00:00 2001 From: JozanLeClerc Date: Sun, 15 Mar 2020 17:22:05 +0100 Subject: Back to the GNU C Compiler, tweaked move speed --- Makefile | 9 ++++++++- inc/cub3d_defines.h | 6 +++--- libft/Makefile | 6 +++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5feb222..9a5fb36 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,11 @@ endif DEBUG = -glldb FSANITIZE = -fsanitize=address #--------------------------------------------------------------------------------------------------# -CC = clang +ifeq (${OS}, Darwin) + CC = clang +else + CC = gcc +endif #--------------------------------------------------------------------------------------------------# CFLAGS = -std=c89 CFLAGS += -Wall @@ -186,6 +190,9 @@ endif #--------------------------------------------------------------------------------------------------# fclean: clean @$(MAKE) --no-print-directory -C ${LFT_DIR} fclean +ifeq (${OS}, Linux) + ${RM} ${MLX_GNU_DIR}libmlx_x86_64.a +endif ${RM} ${NAME} ${RM} ${NAME}.dSYM #--------------------------------------------------------------------------------------------------# diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index c931b2d..0cd15fa 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -106,9 +106,9 @@ enum ** ====== MOVE SPEED ====== */ -# define FT_MOVE_SPEED 0.2 -# define FT_STRAFE_SPEED 0.2 -# define FT_ROT_SPEED 0.2 +# define FT_MOVE_SPEED 0.28 +# define FT_STRAFE_SPEED 0.28 +# define FT_ROT_SPEED 0.28 /* ** ====== COLLISION ====== diff --git a/libft/Makefile b/libft/Makefile index fe25355..502c38a 100644 --- a/libft/Makefile +++ b/libft/Makefile @@ -121,7 +121,11 @@ OS = $(shell uname) DEBUG = -glldb FSANITIZE = -fsanitize=address #------------------------------------------------------------------------------# -CC = clang +ifeq (${OS}, Darwin) + CC = clang +else + CC = gcc +endif #------------------------------------------------------------------------------# CFLAGS = -std=c89 CFLAGS += -Wall -- cgit v1.2.3