aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile.old
diff options
context:
space:
mode:
authorGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-07 19:16:02 +0000
committerGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-07 19:16:02 +0000
commitbe9ad4e5fc6126a1273a7dccf1a85db72e763df3 (patch)
treec2cbcb82171d33e7034116891d6f6f70c6448537 /Makefile.old
parent41249466fe997f9df3fec3c06e03d56fc48be607 (diff)
Higher resolution timers for bench.
Diffstat (limited to 'Makefile.old')
-rw-r--r--Makefile.old14
1 files changed, 11 insertions, 3 deletions
diff --git a/Makefile.old b/Makefile.old
index 7881dfa89d..c78c101204 100644
--- a/Makefile.old
+++ b/Makefile.old
@@ -133,7 +133,7 @@ ifeq ($(SKIA_BUILD_FOR),mac)
endif
else
- LINKER_OPTS += -lpng -lfreetype
+ LINKER_OPTS += -lpng -lfreetype -lrt
DEFINES += -DSK_BUILD_FOR_UNIX -DSK_ENABLE_LIBPNG -DGR_LINUX_BUILD=1
ifeq ($(SKIA_MESA),true)
LINKER_OPTS += -lOSMesa -lGLU
@@ -203,8 +203,15 @@ out/libskia.so: Makefile $(OBJ_LIST) $(JUST_COMPILE_OBJS)
##############################################################################
BENCH_SRCS := RectBench.cpp SkBenchmark.cpp benchmain.cpp BitmapBench.cpp \
- RepeatTileBench.cpp DecodeBench.cpp FPSBench.cpp PathBench.cpp \
- GradientBench.cpp MatrixBench.cpp ScalarBench.cpp
+ RepeatTileBench.cpp DecodeBench.cpp FPSBench.cpp PathBench.cpp \
+ GradientBench.cpp MatrixBench.cpp ScalarBench.cpp \
+ BenchTimer.cpp BenchGpuTimer_gl.cpp
+
+ifeq ($(SKIA_BUILD_FOR),mac)
+ BENCH_SRCS += BenchSysTimer_mach.cpp
+else
+ BENCH_SRCS += BenchSysTimer_posix.cpp
+endif
BENCH_SRCS := $(addprefix bench/, $(BENCH_SRCS))
@@ -318,4 +325,5 @@ help:
@echo " SKIA_SCALAR=fixed for fixed-point build"
@echo " SKIA_BUILD_FOR=mac for mac build (e.g. CG for image decoding)"
@echo " SKIA_PDF_SUPPORT=false to disable the pdf generation backend"
+ @echo " SKIA_MESA=true to build with osmesa instead of native GL.
@echo ""