From 883b20b369b052724e59cf2dfcddab2e61a28b64 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 20 Jun 2016 22:54:55 -0400 Subject: [PATCH] pull in and build glcxx submodule --- .gitmodules | 3 +++ libs/glcxx | 1 + wscript | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 libs/glcxx diff --git a/.gitmodules b/.gitmodules index 51dbd85..8f66578 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "libs/googletest"] path = libs/googletest url = git://github.com/google/googletest +[submodule "libs/glcxx"] + path = libs/glcxx + url = git://github.com/holtrop/glcxx.git diff --git a/libs/glcxx b/libs/glcxx new file mode 160000 index 0000000..c55c2ae --- /dev/null +++ b/libs/glcxx @@ -0,0 +1 @@ +Subproject commit c55c2ae3b58d621d3127af7ed5980f7055cba486 diff --git a/wscript b/wscript index d8f681e..e2e1cad 100644 --- a/wscript +++ b/wscript @@ -11,10 +11,12 @@ def configure(conf): def build(bld): includes = [p for p in bld.path.ant_glob("src/**", dir = True) if os.path.isdir(p.abspath())] + includes += ["libs/glcxx/include"] bld(features = "c cprogram cxx cxxprogram", target = "jes", - source = bld.path.ant_glob(["src/**/*.cc", "src/**/*.c"]), + source = bld.path.ant_glob(["src/**/*.cc", "src/**/*.c", "libs/glcxx/src/glcxx/*"]), includes = includes, + defines = ["GLCXX_GL_INCLUDE=\"gl3w.h\""], cxxflags = ["-Wall", "-std=gnu++14"], lib = ["dl", "GL"])