From 1eb0cc00adc2389fb1ce50cb9fc8cddee4806c33 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 11 Jan 2017 23:36:29 -0500 Subject: [PATCH] include GUI sources in unit test build --- wscript | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/wscript b/wscript index 3788c67..14d48b4 100644 --- a/wscript +++ b/wscript @@ -23,24 +23,28 @@ def build(bld): defines += ["PLATFORM_LINUX"] elif platform.system() == "Windows": defines += ["PLATFORM_WINDOWS"] + defines += ['GLCXX_GL_INCLUDE="gl3w.h"'] + sources = bld.path.ant_glob(["src/**/*.cc", "src/**/*.c", "libs/glcxx/src/glcxx/*"]) + libs = ["dl", "GL"] bld(features = "c cprogram cxx cxxprogram", target = APPNAME, - source = bld.path.ant_glob(["src/**/*.cc", "src/**/*.c", "libs/glcxx/src/glcxx/*"]), + source = sources, includes = includes, - defines = ['GLCXX_GL_INCLUDE="gl3w.h"'] + defines, + defines = defines, cxxflags = ["-Wall", "-std=gnu++14", "-O2", "-Wno-switch"], - lib = ["dl", "GL"], + lib = libs, uselib = ["SDL2", "FreeType2"]) - test_libs = [] + test_libs = libs + [] if platform.system() == "Linux": test_libs += ["pthread"] elif platform.system() == "Windows": pass - test_sources = bld.path.ant_glob("src/core/**/*.cc") + import sys + test_sources = bld.path.ant_glob(["src/*/**/*.cc", "src/*/**/*.c", "libs/glcxx/src/glcxx/*"]) test_sources += bld.path.ant_glob("test/src/**/*.cc") test_sources += ["libs/googletest/src/gtest-all.cc"] - test_includes = ["src/core"] + test_includes = includes + [] test_includes += ["libs/googletest/include", "libs/googletest"] bld(features = "cxx cxxprogram", target = "tests", @@ -48,5 +52,6 @@ def build(bld): includes = test_includes, defines = defines, lib = test_libs, - cxxflags = ["-Wall", "-std=gnu++14", "--coverage"], - linkflags = ["--coverage"]) + cxxflags = ["-Wall", "-std=gnu++14", "--coverage", "-Wno-switch"], + linkflags = ["--coverage"], + uselib = ["SDL2", "FreeType2"])