medfall

commit 35527c4411de80ed8c291062ad4e0fac6ce28dfb
parent 1d33cd7e80b54a3d0d5bfba2aad863e399f4dfa3
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Fri Jul 14 23:37:53 +0300

Move stb build trickery into .cc files

Diffstat:
libs/stb.lua
 | 
13
++-----------
libs/stb/stb_image.cc
 | 
2
++
libs/stb/stb_image_write.cc
 | 
2
++
libs/stb/stb_truetype.cc
 | 
3
+++
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/libs/stb.lua b/libs/stb.lua
@@ -1,14 +1,5 @@
 lib( "stb_image", { "libs/stb/stb_image" } )
-obj( "libs/stb/stb_image", "libs/stb/stb_image.h" )
-msvc_obj_cxxflags( "libs/stb/stb_image", "/DSTB_IMAGE_IMPLEMENTATION /wd4244 /wd4456" )
-gcc_obj_cxxflags( "libs/stb/stb_image", "-DSTB_IMAGE_IMPLEMENTATION -Wno-shadow -Wno-implicit-fallthrough" )
-
+msvc_obj_cxxflags( "libs/stb/stb_image", "/wd4244 /wd4456" )
+gcc_obj_cxxflags( "libs/stb/stb_image", "-Wno-shadow -Wno-implicit-fallthrough" )
 lib( "stb_image_write", { "libs/stb/stb_image_write" } )
-obj( "libs/stb/stb_image_write", "libs/stb/stb_image_write.h" )
-msvc_obj_cxxflags( "libs/stb/stb_image_write", "/DSTB_IMAGE_WRITE_IMPLEMENTATION" )
-gcc_obj_cxxflags( "libs/stb/stb_image_write", "-DSTB_IMAGE_WRITE_IMPLEMENTATION" )
-
 lib( "stb_truetype", { "libs/stb/stb_truetype" } )
-obj( "libs/stb/stb_truetype", "libs/stb/stb_truetype.h" )
-msvc_obj_cxxflags( "libs/stb/stb_truetype", "/DSTB_TRUETYPE_IMPLEMENTATION /DSTB_RECT_PACK_IMPLEMENTATION" )
-gcc_obj_cxxflags( "libs/stb/stb_truetype", "-DSTB_TRUETYPE_IMPLEMENTATION -DSTB_RECT_PACK_IMPLEMENTATION" )
diff --git a/libs/stb/stb_image.cc b/libs/stb/stb_image.cc
@@ -0,0 +1,2 @@
+#define STB_IMAGE_IMPLEMENTATION
+#include "stb_image.h"
diff --git a/libs/stb/stb_image_write.cc b/libs/stb/stb_image_write.cc
@@ -0,0 +1,2 @@
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image_write.h"
diff --git a/libs/stb/stb_truetype.cc b/libs/stb/stb_truetype.cc
@@ -0,0 +1,3 @@
+#define STB_TRUETYPE_IMPLEMENTATION
+#define STB_RECT_PACK_IMPLEMENTATION
+#include "stb_truetype.h"