Merge branch 'master' into master

Author: dolovnyak

Makefile

@@ -76,7 +76,8 @@ LIBS			=	-L$(FT_DIR) -lft \
 					-L$(JTOC_DIR) -ljtoc
 
 CC				=	gcc
-CFLAGS			=	-O3 -Wall -Wextra -Werror -D APPLE___
+
+CFLAGS			=	-Wall -Wextra -Werror -O3
 
 all: $(NAME)
 

README.md

@@ -1,6 +1,6 @@
-# Raycast engine
+# Wolf3D
 
-[Download demo for windows](https://github.com/dolovnyak/raycast-engine/raw/master/raycast_demo.zip)
+[Download demo for windows](https://github.com/GodFlight/Wolf3D/raw/master/raycast_demo.zip)
 ###
 
 ![Image alt](https://github.com/GodFlight/Wolf3D/raw/master/image/1.png)

src/main.c

@@ -1,7 +1,6 @@
 # define STB_IMAGE_IMPLEMENTATION
 #include "raycast.h"
 
-#ifdef APPLE___
 int		main()
 {
 	t_conf_json	conf;
@@ -19,22 +18,3 @@ int		main()
     main_loop(m);
     return (0);
 }
-#else
-int		SDL_main(int argc, char *argv[])
-{
-    t_conf_json	conf;
-    t_rc_main	*m;
-    SDL_Thread	*thread;
-
-    m = rc_main_init();
-    if (rc_jtoc_main_from_json(m, "./json/config.json", &conf))
-        exit(0);
-    m->sdl->mutex = SDL_CreateMutex();
-    thread = SDL_CreateThread(draw_loop, "draw_loop", (void *)m);
-    SDL_DetachThread(thread);
-    thread = SDL_CreateThread(physic_loop, "physic_loop", (void *)m);
-    SDL_DetachThread(thread);
-    main_loop(m);
-    return (0);
-}
-#endif

src/rc_jtoc/rc_jtoc_win_from_json.c

@@ -14,14 +14,9 @@
 
 static int	win_from_json_helper(t_rc_main *m, t_sdl *sdl)
 {
-#ifdef APPLE___
 	if (!(sdl->win = SDL_CreateWindow("Wolf3D", SDL_WINDOWPOS_CENTERED,
 			SDL_WINDOWPOS_CENTERED, sdl->win_w, sdl->win_h,
 			SDL_WINDOW_RESIZABLE)))
-#else
-        if (!(sdl->win = SDL_CreateWindow("Wolf3D", 0, 0, sdl->win_w, sdl->win_h,
-                SDL_WINDOW_FULLSCREEN)))
-#endif
 		return (rc_jtoc_sdl_log_error("CREATE WINDOW ERROR", -1));
 	if (!(sdl->renderer = SDL_CreateRenderer(sdl->win, -1, 0)))
 		return (rc_jtoc_sdl_log_error("CREATE WINDOW RENDERER ERROR", -1));