From 33bf113f26d55b990840e3feb483ff5c49c71b07 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 23 Jan 2018 05:51:04 -0500 Subject: [PATCH] move source files under src --- {GL3 => src/GL3}/gl3.h | 0 {GL3 => src/GL3}/gl3w.c | 0 {GL3 => src/GL3}/gl3w.h | 0 app.cc => src/app.cc | 0 wscript | 7 ++++--- 5 files changed, 4 insertions(+), 3 deletions(-) rename {GL3 => src/GL3}/gl3.h (100%) rename {GL3 => src/GL3}/gl3w.c (100%) rename {GL3 => src/GL3}/gl3w.h (100%) rename app.cc => src/app.cc (100%) diff --git a/GL3/gl3.h b/src/GL3/gl3.h similarity index 100% rename from GL3/gl3.h rename to src/GL3/gl3.h diff --git a/GL3/gl3w.c b/src/GL3/gl3w.c similarity index 100% rename from GL3/gl3w.c rename to src/GL3/gl3w.c diff --git a/GL3/gl3w.h b/src/GL3/gl3w.h similarity index 100% rename from GL3/gl3w.h rename to src/GL3/gl3w.h diff --git a/app.cc b/src/app.cc similarity index 100% rename from app.cc rename to src/app.cc diff --git a/wscript b/wscript index 0a243bf..7a40e8c 100644 --- a/wscript +++ b/wscript @@ -7,7 +7,7 @@ def configure(conf): conf.load("compiler_c compiler_cxx") conf.env.INCLUDES += ["libs/glcxx/include"] conf.env.INCLUDES += ["libs/glm"] - conf.env.INCLUDES += ["."] + conf.env.INCLUDES += ["src"] conf.env.DEFINES += ['''GLCXX_GL_INCLUDE="GL3/gl3w.h"'''] conf.env.CXXFLAGS += ["-Wall"] conf.env.CXXFLAGS += ["-std=gnu++14"] @@ -21,9 +21,10 @@ def configure(conf): Popen(["git", "submodule", "update", "--init"]).wait() def build(bld): - sources = ["app.cc"] + \ + sources = \ + bld.path.ant_glob("src/**/*.cc") + \ bld.path.ant_glob("libs/glcxx/src/**/*.cpp") + \ - bld.path.ant_glob("GL3/**/*.c") + bld.path.ant_glob("src/GL3/**/*.c") libs = [] if "MINGW" in os.popen("uname").read():