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

move some sources to src/core

Browse Source
This commit is contained in:
Josh Holtrop 2016-06-20 22:03:43 -04:00
parent e9c4d6419f
commit e16e81375b
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/FileLoader.cc → src/core/FileLoader.cc
View File

0
src/FileLoader.h → src/core/FileLoader.h
View File

0
src/FileReader.cc → src/core/FileReader.cc
View File

0
src/FileReader.h → src/core/FileReader.h
View File

10
wscript
View File

@ -1,5 +1,6 @@
import platform import platform
import re import re
import os.path
def options(opt): def options(opt):
opt.load("compiler_c compiler_cxx") opt.load("compiler_c compiler_cxx")
@ -9,23 +10,26 @@ def configure(conf):
conf.check(header_name = "getopt.h") conf.check(header_name = "getopt.h")
def build(bld): def build(bld):
includes = [p for p in bld.path.ant_glob("src/**", dir = True) if os.path.isdir(p.abspath())]
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"]),
includes = includes,
cxxflags = ["-Wall", "-std=gnu++14"], cxxflags = ["-Wall", "-std=gnu++14"],
lib = ["dl", "GL"]) lib = ["dl", "GL"])
test_libs = [] test_libs = []
if re.search(r'linux', platform.platform(), re.IGNORECASE): if re.search(r'linux', platform.platform(), re.IGNORECASE):
test_libs += ["pthread"] test_libs += ["pthread"]
test_sources = bld.path.ant_glob("src/**/*.cc") test_sources = bld.path.ant_glob("src/core/**/*.cc")
test_sources = [s for s in test_sources if not s.abspath().endswith("src/jes.cc")]
test_sources += bld.path.ant_glob("test/src/**/*.cc") test_sources += bld.path.ant_glob("test/src/**/*.cc")
test_sources += ["gtest-1.7.0/src/gtest-all.cc", test_sources += ["gtest-1.7.0/src/gtest-all.cc",
"gtest-1.7.0/src/gtest_main.cc"] "gtest-1.7.0/src/gtest_main.cc"]
test_includes = ["src/core"]
test_includes += ["gtest-1.7.0/include", "gtest-1.7.0"]
bld(features = "cxx cxxprogram", bld(features = "cxx cxxprogram",
target = "tests", target = "tests",
source = test_sources, source = test_sources,
includes = ["gtest-1.7.0/include", "gtest-1.7.0", "src"], includes = test_includes,
lib = test_libs, lib = test_libs,
cxxflags = ["-Wall", "-std=gnu++14"]) cxxflags = ["-Wall", "-std=gnu++14"])