client/deps/glbench/src/Makefile - Issue 1732030: Replaced funky state machines with classes. This is in preparation of doing the same to gl_Bench.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/deps/glbench/src/Makefile

Issue 1732030: Replaced funky state machines with classes. This is in preparation of doing the same to gl_Bench. (Closed) Base URL: ssh://git@chromiumos-git//autotest.git

Patch Set: Got rid of static test list initialization, fixed USE_EGL. Created 10 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: client/deps/glbench/src/Makefile

diff --git a/client/deps/glbench/src/Makefile b/client/deps/glbench/src/Makefile

index 4dd65164c6ea4dc615a32fb5fcaa151f87e7425f..188e684b512a8e1ce74c3583a21908575e1603ab 100644

--- a/client/deps/glbench/src/Makefile

+++ b/client/deps/glbench/src/Makefile

@@ -21,7 +21,7 @@ WINDOWMANAGERTEST = ../windowmanagertest

GCLIENT_ROOT ?= ../../../../../../../..

ifdef USE_EGL

-CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include

+CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include -DUSE_EGL

SOURCES_COMMON += egl_stuff.cc

SOURCES_TEARTEST += teartest_egl.cc

LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/khronos/files -lEGL

@@ -39,7 +39,11 @@ DEPS_ALL = $(SOURCES_ALL:.cc=.d)

.PHONY: all clean

-all: $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST)

+all: $(GL_BENCH) $(TEARTEST)

+ifndef USE_EGL

+all: $(WINDOWMANAGERTEST)

+endif

$(TEARTEST): $(OBJS_COMMON) $(OBJS_TEARTEST)

$(GL_BENCH): $(OBJS_COMMON) $(OBJS_GL_BENCH)

« no previous file with comments | « no previous file | client/deps/glbench/src/egl_stuff.cc » ('j') | no next file with comments »