client/deps/glbench/src/Makefile - Issue 3110010: [autotest] Update to compile against new libchrome

Side by Side Diff

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

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

Side by Side Diff: client/deps/glbench/src/Makefile

Issue 3110010: [autotest] Update to compile against new libchrome (Closed) Base URL: http://src.chromium.org/git/autotest.git

Patch Set: Created 10 years, 4 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 unified diff | Download patch

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

OLD	NEW
1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.	1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 SOURCES_COMMON = xlib_window.cc utils.cc	5 SOURCES_COMMON = xlib_window.cc utils.cc

6 SOURCES_GL_BENCH = main.cc swaptest.cc yuvtest.cc testbase.cc	6 SOURCES_GL_BENCH = main.cc swaptest.cc yuvtest.cc testbase.cc

7 SOURCES_GL_BENCH += readpixeltest.cc	7 SOURCES_GL_BENCH += readpixeltest.cc

8 SOURCES_GL_BENCH += attributefetchtest.cc varyingsandddxytest.cc cleartest.cc	8 SOURCES_GL_BENCH += attributefetchtest.cc varyingsandddxytest.cc cleartest.cc

9 SOURCES_GL_BENCH += textureupdatetest.cc trianglesetuptest.cc fillratetest.cc	9 SOURCES_GL_BENCH += textureupdatetest.cc trianglesetuptest.cc fillratetest.cc

10	10

11 GRAPHICS_BACKEND ?= OPENGL	11 GRAPHICS_BACKEND ?= OPENGL

12	12

13 # TODO: port these to GLES	13 # TODO: port these to GLES

14 ifeq ($(GRAPHICS_BACKEND),OPENGL)	14 ifeq ($(GRAPHICS_BACKEND),OPENGL)

15 SOURCES_GL_BENCH += windowmanagercompositingtest.cc	15 SOURCES_GL_BENCH += windowmanagercompositingtest.cc

16 endif	16 endif

17 SOURCES_TEARTEST = teartest.cc	17 SOURCES_TEARTEST = teartest.cc

18 SOURCES_WINDOWMANAGERTEST = windowmanagertest.cc	18 SOURCES_WINDOWMANAGERTEST = windowmanagertest.cc

19 SOURCES_ALL = $(SOURCES_COMMON) \	19 SOURCES_ALL = $(SOURCES_COMMON) \

20 $(SOURCES_GL_BENCH) \	20 $(SOURCES_GL_BENCH) \

21 $(SOURCES_TEARTEST) \	21 $(SOURCES_TEARTEST) \

22 $(SOURCES_WINDOWMANAGERTEST)	22 $(SOURCES_WINDOWMANAGERTEST)

23	23

24 CXXFLAGS = -g -Wall -Werror	24 CXXFLAGS = -g -Wall -Werror

25 LDFLAGS = -lbase -lrt -lgflags	25 LDFLAGS = -lbase -lrt -lgflags -lglib-2.0

26 # To compile outside of chroot, use the following two lines:	26 # To compile outside of chroot, use the following two lines:

27 #CXXFLAGS += -I../../../../../../chrome/files	27 #CXXFLAGS += -I../../../../../../chrome/files

28 #LDFLAGS += -L../../../../../../chrome	28 #LDFLAGS += -L../../../../../../chrome

29	29

30 GL_BENCH = ../glbench	30 GL_BENCH = ../glbench

31 TEARTEST = ../teartest	31 TEARTEST = ../teartest

32 WINDOWMANAGERTEST = ../windowmanagertest	32 WINDOWMANAGERTEST = ../windowmanagertest

33	33

34 ifeq ($(GRAPHICS_BACKEND),OPENGLES)	34 ifeq ($(GRAPHICS_BACKEND),OPENGLES)

35 CXXFLAGS += -DUSE_OPENGLES	35 CXXFLAGS += -DUSE_OPENGLES

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 $(RM) $(OBJS_ALL) $(DEPS_ALL)	67 $(RM) $(OBJS_ALL) $(DEPS_ALL)

68 $(RM) .o .d	68 $(RM) .o .d

69	69

70 $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST):	70 $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST):

71 $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS)	71 $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS)

72	72

73 $(OBJS_ALL): %.o: %.cc	73 $(OBJS_ALL): %.o: %.cc

74 $(CXX) $(CXXFLAGS) -c $< -o $@ -MMD	74 $(CXX) $(CXXFLAGS) -c $< -o $@ -MMD

75	75

76 -include $(DEPS_ALL)	76 -include $(DEPS_ALL)

OLD	NEW