medfall

commit ea60036ce44f38f58efd6cbff22274d4ab6933d0
parent 5f9f71dc6d0c908e393bb3d1e9a389d32789ce51
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Nov 13 22:28:10 +0200

Put GLFW_INCLUDE_NONE in the code

Diffstat:
Makefile
 | 
3
+--
gl.cc
 | 
2
++
gl.h
 | 
2
+-
main.cc
 | 
1
+
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -26,8 +26,7 @@ COMMON_OBJS := log.o memory_arena.o work_queue.o immediate.o benchmark.o stb_tru
 WARNINGS := -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wconversion -Wshadow -Wcast-align -Wstrict-overflow
 CXXFLAGS += -std=c++11 -msse2 -fno-exceptions -fno-rtti -I. \
 	-O0 \
-	-ggdb3 -fno-omit-frame-pointer -fno-strict-aliasing -fno-strict-overflow \
-	-DGLFW_INCLUDE_NONE
+	-ggdb3 -fno-omit-frame-pointer -fno-strict-aliasing -fno-strict-overflow
 LDFLAGS += -lm
 
 -include os.mk
diff --git a/gl.cc b/gl.cc
@@ -2,6 +2,8 @@
 #include <string.h>
 
 #include "glad.h"
+
+#define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 
 #include "game.h"
diff --git a/gl.h b/gl.h
@@ -1,7 +1,7 @@
 #ifndef _GL_H_
 #define _GL_H_
 
-#include <GLFW/glfw3.h>
+struct GLFWwindow;
 
 GLFWwindow * gl_init();
 void gl_term();
diff --git a/main.cc b/main.cc
@@ -6,6 +6,7 @@
 #include <xmmintrin.h>
 #include <pmmintrin.h>
 
+#define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 
 #include "game.h"