diff --git a/gyp/bench.gyp b/gyp/bench.gyp new file mode 100644 index 0000000000..35f32661ac --- /dev/null +++ b/gyp/bench.gyp @@ -0,0 +1,56 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'bench', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs': [ + '../include/effects', + '../include/utils', + '../include/images', + ], + 'sources': [ + '../bench/benchmain.cpp', + + '../bench/SkBenchmark.h', + '../bench/SkBenchmark.cpp', + + '../bench/BitmapBench.cpp', + '../bench/DecodeBench.cpp', + '../bench/FPSBench.cpp', + '../bench/GradientBench.cpp', + '../bench/PathBench.cpp', + '../bench/RectBench.cpp', + '../bench/RepeatTileBench.cpp', + '../bench/TextBench.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'utils.gyp:utils', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '1', + 'EntryPointSymbol': 'mainCRTStartup', + 'AdditionalDependencies': [ + 'OpenGL32.lib', + 'usp10.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: \ No newline at end of file diff --git a/gyp/core.gyp b/gyp/core.gyp index 43630d710e..68f960d6f0 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -153,6 +153,7 @@ '../src/ports/SkMemory_malloc.cpp', '../src/ports/SkOSFile_stdio.cpp', '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkTime_win.cpp', '../src/ports/SkXMLParser_empty.cpp', '../src/ports/sk_predefined_gamma.h', @@ -304,6 +305,7 @@ [ 'OS != "win"', { 'sources!': [ '../src/ports/SkDebug_win.cpp', + '../src/ports/SkTime_win.cpp', ], }], ], diff --git a/include/utils/SkEGLContext.h b/include/utils/SkEGLContext.h index d67cf0c317..daa0667f8e 100644 --- a/include/utils/SkEGLContext.h +++ b/include/utils/SkEGLContext.h @@ -8,6 +8,9 @@ #elif defined(SK_BUILD_FOR_UNIX) #include #include +#elif defined(SK_BUILD_FOR_WIN32) + #include + #include #else #endif