medfall

commit 71387bb4a03630a02783c875d1f31ee569e9aa04
parent 1d6468d50d34fc931a75ac4288af03aa62ea2c0a
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sat Apr 16 14:58:41 +0100

Move glloadgen make rules in libs/libs.mk

Diffstat:
Makefile
 | 
9
+--------
libs/libs.mk
 | 
5
+++++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
@@ -17,14 +17,6 @@ audio.so: test_audio.o audio.o wave.o linux_audio.o
 sm.so: shadow_map.o
 
 # Common dependencies
-
-# glloadgen stuff
-# TODO: move this into libs/glloadgen/make.mk?
-opengl33.cc:
-	lua libs/glloadgen/LoadGen.lua -style=pointer_c -spec=gl -version=3.3 -profile=core opengl33 -exts KHR_debug EXT_texture_sRGB EXT_texture_compression_s3tc
-	mv gl_opengl33.h opengl33.h
-	mv gl_opengl33.c opengl33.cc
-	sed -i "s/gl_opengl/opengl/" opengl33.cc
 COMMON_OBJS := log.o memory_arena.o work_queue.o immediate.o benchmark.o stb_truetype.o stb_image.o opengl33.o glsl.o
 
 # Compiler flags
@@ -36,5 +28,6 @@ CXXFLAGS += -std=c++11 -msse2 -fno-exceptions -fno-rtti \
 	-DGL_GLEXT_PROTOTYPES -DGLFW_INCLUDE_NONE
 LDFLAGS += -lm -pthread
 
+-include libs/libs.mk
 -include os.mk
 -include rules.mk
diff --git a/libs/libs.mk b/libs/libs.mk
@@ -0,0 +1,5 @@
+opengl33.cc opengl33.h:
+	lua libs/glloadgen/LoadGen.lua -style=pointer_c -spec=gl -version=3.3 -profile=core opengl33 -exts KHR_debug EXT_texture_sRGB EXT_texture_compression_s3tc
+	mv gl_opengl33.h opengl33.h || true
+	mv gl_opengl33.c opengl33.cc || true
+	sed -i "s/gl_opengl/opengl/" opengl33.cc