| Index: client/deps/glbench/src/Makefile
|
| diff --git a/client/deps/glbench/src/Makefile b/client/deps/glbench/src/Makefile
|
| index 9692fa34f95880fc6e4fc4fe6924ffeee4409e6c..4dd65164c6ea4dc615a32fb5fcaa151f87e7425f 100644
|
| --- a/client/deps/glbench/src/Makefile
|
| +++ b/client/deps/glbench/src/Makefile
|
| @@ -5,13 +5,18 @@
|
| SOURCES_COMMON = xlib_window.cc utils.cc
|
| SOURCES_GL_BENCH = main.cc bench.cc shaders.cc
|
| SOURCES_TEARTEST = teartest.cc
|
| -SOURCES_ALL = $(SOURCES_COMMON) $(SOURCES_GL_BENCH) $(SOURCES_TEARTEST)
|
| +SOURCES_WINDOWMANAGERTEST = windowmanagertest.cc
|
| +SOURCES_ALL = $(SOURCES_COMMON) \
|
| + $(SOURCES_GL_BENCH) \
|
| + $(SOURCES_TEARTEST) \
|
| + $(SOURCES_WINDOWMANAGERTEST)
|
|
|
| CXXFLAGS = -g -Wall -Werror -I$(GCLIENT_ROOT)/src/third_party/chrome/files
|
| LDFLAGS = -lGL -lX11
|
| LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/chrome -lbase -lrt -lgflags
|
| GL_BENCH = ../glbench
|
| TEARTEST = ../teartest
|
| +WINDOWMANAGERTEST = ../windowmanagertest
|
|
|
| GCLIENT_ROOT ?= ../../../../../../../..
|
|
|
| @@ -28,20 +33,23 @@ endif
|
| OBJS_COMMON = $(SOURCES_COMMON:.cc=.o)
|
| OBJS_GL_BENCH = $(SOURCES_GL_BENCH:.cc=.o)
|
| OBJS_TEARTEST = $(SOURCES_TEARTEST:.cc=.o)
|
| +OBJS_WINDOWMANAGERTEST = $(SOURCES_WINDOWMANAGERTEST:.cc=.o)
|
| OBJS_ALL = $(SOURCES_ALL:.cc=.o)
|
| DEPS_ALL = $(SOURCES_ALL:.cc=.d)
|
|
|
| .PHONY: all clean
|
|
|
| -all: $(GL_BENCH) $(TEARTEST)
|
| +all: $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST)
|
|
|
| $(TEARTEST): $(OBJS_COMMON) $(OBJS_TEARTEST)
|
| $(GL_BENCH): $(OBJS_COMMON) $(OBJS_GL_BENCH)
|
| +$(WINDOWMANAGERTEST): $(OBJS_COMMON) $(OBJS_WINDOWMANAGERTEST)
|
|
|
| clean:
|
| - $(RM) $(GL_BENCH) $(TEARTEST) $(OBJS_ALL) $(DEPS_ALL)
|
| + $(RM) $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST)
|
| + $(RM) $(OBJS_ALL) $(DEPS_ALL)
|
|
|
| -$(GL_BENCH) $(TEARTEST):
|
| +$(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST):
|
| $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS)
|
|
|
| $(OBJS_ALL): %.o: %.cc
|
|
|