diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-02-22 23:59:26 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-02-22 23:59:26 +0100 |
| commit | 4ae78583f731a3d8512693e80ccbcf522855312b (patch) | |
| tree | ad49e2a498f7b98b52e0169eab5f2fe6504740cd | |
| parent | Smooth af (diff) | |
| download | 42-cub3d-4ae78583f731a3d8512693e80ccbcf522855312b.tar.gz 42-cub3d-4ae78583f731a3d8512693e80ccbcf522855312b.tar.bz2 42-cub3d-4ae78583f731a3d8512693e80ccbcf522855312b.tar.xz 42-cub3d-4ae78583f731a3d8512693e80ccbcf522855312b.tar.zst 42-cub3d-4ae78583f731a3d8512693e80ccbcf522855312b.zip | |
Fixed map_three, Makefiles have POWERMODE
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | inc/cub3d_defines.h | 2 | ||||
| -rw-r--r-- | libft/Makefile | 8 | ||||
| -rw-r--r-- | map/map_one.cub | 2 | ||||
| -rw-r--r-- | map/map_three.cub | 8 |
5 files changed, 23 insertions, 6 deletions
@@ -97,6 +97,12 @@ ifdef ASAN CFLAGS += ${FSANITIZE} endif #--------------------------------------------------------------------------------------------------# +ifdef POWER + CFLAGS += -march=ivybridge + CFLAGS += -O2 + CFLAGS += -pipe +endif +#--------------------------------------------------------------------------------------------------# CDEFS = -DFT_SCR_SIZE=\"${SCR_SZE}\" ifneq (${OS}, Darwin) CDEFS += -DFT_W_KEY=119 @@ -140,6 +146,9 @@ ifeq (${OS}, Darwin) endif ifdef ASAN @$(MAKE) --no-print-directory -C ${LFT_DIR} all ASAN=1 +endif +ifdef POWER + @$(MAKE) --no-print-directory -C ${LFT_DIR} all POWER=1 else @$(MAKE) --no-print-directory -C ${LFT_DIR} all endif diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h index f591f14..dd34fa7 100644 --- a/inc/cub3d_defines.h +++ b/inc/cub3d_defines.h @@ -49,7 +49,7 @@ ** ====== MOVE SPEED ====== */ -# define FT_MOVE_SPEED 0.3 +# define FT_MOVE_SPEED 0.2 # define FT_STRAFE_SPEED 0.1 # define FT_ROT_SPEED 0.09 diff --git a/libft/Makefile b/libft/Makefile index aef5f5d..fce6434 100644 --- a/libft/Makefile +++ b/libft/Makefile @@ -115,16 +115,24 @@ DEBUG = -glldb FSANITIZE = -fsanitize=address #------------------------------------------------------------------------------# CC = clang +#------------------------------------------------------------------------------# CFLAGS = -std=c89 CFLAGS += -Wall CFLAGS += -Wextra CFLAGS += -Werror CFLAGS += -pedantic +#------------------------------------------------------------------------------# ifdef ASAN CFLAGS += ${DEBUG} CFLAGS += ${FSANITIZE} endif #------------------------------------------------------------------------------# +ifdef POWER + CFLAGS += -march=ivybridge + CFLAGS += -O2 + CFLAGS += -pipe +endif +#------------------------------------------------------------------------------# NAME = libft.a #==============================================================================# #-------------------------------- Library -------------------------------------# diff --git a/map/map_one.cub b/map/map_one.cub index a079238..9269e32 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,4 +1,4 @@ -R 1400 10000 +R 1400 900 NO ./media/img/BRIQUASSES.xpm SO ./media/img/BRIQUASSE_3.xpm diff --git a/map/map_three.cub b/map/map_three.cub index c2e6edf..fade5ef 100644 --- a/map/map_three.cub +++ b/map/map_three.cub @@ -9,7 +9,7 @@ S ./media/img/segfot.xpm C 50,100,200 F 50,190,124 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 -1 E 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 +1 E 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 |