Merge: doc -> main

Makefile

@@ -8,13 +8,13 @@ OBJ = \
 	src/shader.o \
 	src/input.o \
 	src/mesh.o \
+	src/alan.o \
 	src/main.o 
 
 CFLAGS = \
 	-I./ext/cglm/include  \
 	-I./ext/glfw/include  \
-	-Wall -Wno-unused-function -std=c99  \
-	-D_XOPEN_SOURCE 
+	-Wall -Wno-unused-function -std=c99   \
 
 help:
 	@echo "Para compilar el proyecto a tu sistema operativo"
@@ -30,19 +30,19 @@ help:
 
 # WINDOWS
 windows: $(OBJ) glfw.dll
-	$(CC) -L. -lGL -lglfw -o $(BIN).exe $(OBJ)
+	$(CC) $(CFLAGS) $(OBJ) -o $(BIN) -L. -lglfw -lopengl32 -lglew32 
 
 glfw.dll:
-	$(CC) -fPIC -shared -D_GLFW_WIN32 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@ 
+	$(CC) -fPIC -shared -D_GLFW_WIN32 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@ -lgdi32 
 
 # LINUX
 linux-x11: $(OBJ)
 	$(MAKE) BKN=_GLFW_X11 libglfw.so
-	$(CC) -L. -lGL -lglfw -o $(BIN) $(OBJ)
+	$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw 
 
 linux-wayland: $(OBJ)
 	$(MAKE) BKN=_GLFW_WAYLAND libglfw.so
-	$(CC) -L. -lGL -lglfw -o $(BIN) $(OBJ)
+	$(CC) -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw 
 
 run-linux:
 	LD_LIBRARY_PATH=. ./$(BIN)
@@ -50,7 +50,7 @@ run-linux:
 # COCOA
 cocoa: $(OBJ)
 	$(MAKE) BKN=_GLFW_COCOA libglfw.so
-	$(CC) -framework OpenGL -L. lglfw  -o $(BIN) $(OBJ)
+	$(CC) -framework OpenGL -o $(BIN) $(OBJ) -L. -lGLEW -lGL -lglfw
 
 libglfw.so:
 	$(CC) -fPIC -shared -D$(BKN) -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@