diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -103,9 +103,6 @@ SLANGC_SOURCES += $(CORE_SOURCES) SLANG_GLSLANG_SOURCES := source/slang-glslang/*.cpp SLANG_GLSLANG_HEADERS := source/slang-glslang/*.h -SLANG_EVAL_TEST_SOURCES := tools/slang-eval-test/*.cpp -SLANG_EVAL_TEST_HEADERS := - SLANG_REFLECTION_TEST_SOURCES := tools/slang-reflection-test/*.cpp SLANG_REFLECTION_TEST_HEADERS := @@ -137,12 +134,11 @@ SLANG := $(OUTPUTDIR)$(SHARED_LIB_PREFIX)slang$(SHARED_LIB_SUFFIX) SLANGC := $(OUTPUTDIR)slangc$(BIN_SUFFIX) SLANG_GLSLANG := $(OUTPUTDIR)$(SHARED_LIB_PREFIX)slang-glslang$(SHARED_LIB_SUFFIX) SLANG_TEST := $(OUTPUTDIR)slang-test$(BIN_SUFFIX) -SLANG_EVAL_TEST := $(OUTPUTDIR)slang-eval-test$(BIN_SUFFIX) SLANG_REFLECTION_TEST := $(OUTPUTDIR)slang-reflection-test$(BIN_SUFFIX) # By default, when the user invokes `make`, we will build the # `slang` shared library, and the `slangc` front-end application. -all: slang slang-glslang slangc slang-test slang-eval-test slang-reflection-test +all: slang slang-glslang slangc slang-test slang-reflection-test mkdirs: $(OUTPUTDIR) @@ -151,7 +147,6 @@ slang: mkdirs $(SLANG) slangc: mkdirs $(SLANGC) slang-glslang: mkdirs $(SLANG_GLSLANG) slang-test: mkdirs $(SLANG_TEST) -slang-eval-test: mkdirs $(SLANG_EVAL_TEST) slang-reflection-test: mkdirs $(SLANG_REFLECTION_TEST) $(SLANG): $(SLANG_SOURCES) $(SLANG_HEADERS) @@ -166,16 +161,13 @@ $(SLANG_GLSLANG): $(SLANG_GLSLANG_SOURCES) $(SLANG_GLSLANG_HEADERS) $(SLANG_TEST): $(SLANG_TEST_SOURCES) $(SLANG_TEST_HEADERS) $(SLANG) $(CXX) $(LDFLAGS) -o $@ $(CFLAGS) $(SLANG_TEST_SOURCES) -ldl $(RELATIVE_RPATH_INCANTATION) -lslang -$(SLANG_EVAL_TEST): $(SLANG_EVAL_TEST_SOURCES) $(SLANG) - $(CXX) $(LDFLAGS) -o $@ $(CFLAGS) $(SLANG_EVAL_TEST_SOURCES) $(RELATIVE_RPATH_INCANTATION) -lslang - $(SLANG_REFLECTION_TEST): $(SLANG_REFLECTION_TEST_SOURCES) $(SLANG) $(CXX) $(LDFLAGS) -o $@ $(CFLAGS) $(SLANG_REFLECTION_TEST_SOURCES) $(RELATIVE_RPATH_INCANTATION) -lslang $(OUTPUTDIR): mkdir -p $(OUTPUTDIR) -test: $(SLANG_TEST) $(SLANG_EVAL_TEST) $(SLANG_REFLECTION_TEST) +test: $(SLANG_TEST) $(SLANG_REFLECTION_TEST) $(SLANG_TEST) -bindir $(OUTPUTDIR) -travis -category $(SLANG_TEST_CATEGORY) $(SLANG_TEST_FLAGS) clean: |