aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-02-06 18:35:48 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-02-06 18:35:48 +0100
commit6fff70fddeae8b73d9fce53d961fec019a52d44e (patch)
tree55429dd4f36d3d6efef2af0fc72c663aaa0a0465
parentReverted Makefile (diff)
download42-cub3d-6fff70fddeae8b73d9fce53d961fec019a52d44e.tar.gz
42-cub3d-6fff70fddeae8b73d9fce53d961fec019a52d44e.tar.bz2
42-cub3d-6fff70fddeae8b73d9fce53d961fec019a52d44e.tar.xz
42-cub3d-6fff70fddeae8b73d9fce53d961fec019a52d44e.tar.zst
42-cub3d-6fff70fddeae8b73d9fce53d961fec019a52d44e.zip
xdpyinfo works on Linux
Diffstat (limited to '')
-rw-r--r--Makefile8
-rw-r--r--map/map_one.cub2
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 47f9dbb..bd60aa5 100644
--- a/Makefile
+++ b/Makefile
@@ -61,9 +61,9 @@ DEBUG = -glldb
FSANITIZE = -fsanitize=address
#------------------------------------------------------------------------------#
ifeq (${OS}, Darwin)
-NAME = cub3d
+ NAME = cub3d
else
-NAME = a.out
+ NAME = a.out
endif
#==============================================================================#
#--------------------------------- UNIX ---------------------------------------#
@@ -71,9 +71,7 @@ endif
MKDIR = mkdir -p
RM = rm -rf
OS = $(shell uname)
-ifeq (${OS}, Darwin)
- SCR_SZE = $(shell xdpyinfo | grep dimensions | awk '{print $$2}')
-endif
+SCR_SZE = $(shell xdpyinfo | grep dimensions | awk '{print $$2}')
#==============================================================================#
#--------------------------------- Rules --------------------------------------#
#==============================================================================#
diff --git a/map/map_one.cub b/map/map_one.cub
index 9bb7687..e30aed1 100644
--- a/map/map_one.cub
+++ b/map/map_one.cub
@@ -1,4 +1,4 @@
-R 20800 11600
+R 2800 1160
NO ./path_to_the_north_texture
SO ./path_to_the_south_texture