josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pull in and build glcxx submodule

Browse Source
This commit is contained in:
Josh Holtrop 2016-06-20 22:54:55 -04:00
parent 7a020a174e
commit 883b20b369
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "libs/googletest"] [submodule "libs/googletest"]
path = libs/googletest path = libs/googletest
url = git://github.com/google/googletest url = git://github.com/google/googletest
[submodule "libs/glcxx"]
path = libs/glcxx
url = git://github.com/holtrop/glcxx.git

1
libs/glcxx Submodule

@ -0,0 +1 @@
Subproject commit c55c2ae3b58d621d3127af7ed5980f7055cba486

4
wscript
View File

@ -11,10 +11,12 @@ def configure(conf):
def build(bld): def build(bld):
includes = [p for p in bld.path.ant_glob("src/**", dir = True) if os.path.isdir(p.abspath())] 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", bld(features = "c cprogram cxx cxxprogram",
target = "jes", 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, includes = includes,
defines = ["GLCXX_GL_INCLUDE=\"gl3w.h\""],
cxxflags = ["-Wall", "-std=gnu++14"], cxxflags = ["-Wall", "-std=gnu++14"],
lib = ["dl", "GL"]) lib = ["dl", "GL"])