move main.cpp outside of the xcode project
git-svn-id: http://skia.googlecode.com/svn/trunk@58 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/BenchTool/BenchTool.xcodeproj/project.pbxproj b/bench/BenchTool/BenchTool.xcodeproj/project.pbxproj
index 7e8ad17..b637494 100644
--- a/bench/BenchTool/BenchTool.xcodeproj/project.pbxproj
+++ b/bench/BenchTool/BenchTool.xcodeproj/project.pbxproj
@@ -9,10 +9,10 @@
/* Begin PBXBuildFile section */
272FB43A0F11A19C00CA935D /* RectBench.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 272FB4390F11A19C00CA935D /* RectBench.cpp */; };
272FB4F30F11B40300CA935D /* SkBenchmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 272FB4F20F11B40300CA935D /* SkBenchmark.cpp */; };
+ 2752A08A0F14CE1300BBDC03 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2752A0890F14CE1300BBDC03 /* main.cpp */; };
27739F4D0F11439200F233EA /* libmaccore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27739F240F11404A00F233EA /* libmaccore.a */; };
27739F4E0F11439300F233EA /* libcore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27739F1A0F11403B00F233EA /* libcore.a */; };
27739F520F1143C000F233EA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27739F510F1143C000F233EA /* Carbon.framework */; };
- 8DD76F650486A84900D96B5E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* main.cpp */; settings = {ATTRIBUTES = (); }; };
8DD76F6A0486A84900D96B5E /* BenchTool.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E8B029090EE04C91782 /* BenchTool.1 */; };
/* End PBXBuildFile section */
@@ -61,9 +61,9 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 08FB7796FE84155DC02AAC07 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
272FB4390F11A19C00CA935D /* RectBench.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RectBench.cpp; path = ../RectBench.cpp; sourceTree = SOURCE_ROOT; };
272FB4F20F11B40300CA935D /* SkBenchmark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkBenchmark.cpp; path = ../SkBenchmark.cpp; sourceTree = SOURCE_ROOT; };
+ 2752A0890F14CE1300BBDC03 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../main.cpp; sourceTree = SOURCE_ROOT; };
27739F120F11403B00F233EA /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../xcode/core/core.xcodeproj; sourceTree = SOURCE_ROOT; };
27739F1C0F11404A00F233EA /* maccore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = maccore.xcodeproj; path = ../../xcode/maccore/maccore.xcodeproj; sourceTree = SOURCE_ROOT; };
27739F510F1143C000F233EA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
@@ -101,7 +101,7 @@
08FB7795FE84155DC02AAC07 /* Source */ = {
isa = PBXGroup;
children = (
- 08FB7796FE84155DC02AAC07 /* main.cpp */,
+ 2752A0890F14CE1300BBDC03 /* main.cpp */,
272FB4F20F11B40300CA935D /* SkBenchmark.cpp */,
272FB4390F11A19C00CA935D /* RectBench.cpp */,
);
@@ -212,9 +212,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 8DD76F650486A84900D96B5E /* main.cpp in Sources */,
272FB43A0F11A19C00CA935D /* RectBench.cpp in Sources */,
272FB4F30F11B40300CA935D /* SkBenchmark.cpp in Sources */,
+ 2752A08A0F14CE1300BBDC03 /* main.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/bench/BenchTool/main.cpp b/bench/BenchTool/main.cpp
deleted file mode 100644
index 34a2b88..0000000
--- a/bench/BenchTool/main.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-//#include <iostream>
-#include "SkCanvas.h"
-#include "SkImageEncoder.h"
-#include "SkString.h"
-
-#include "SkBenchmark.h"
-
-typedef SkTRegistry<SkBenchmark> BenchRegistry;
-
-class Iter {
-public:
- Iter() {
- fBench = BenchRegistry::Head();
- }
-
- SkBenchmark* next() {
- if (fBench) {
- BenchRegistry::Factory f = fBench->factory();
- fBench = fBench->next();
- return f();
- }
- return NULL;
- }
-
-private:
- const BenchRegistry* fBench;
-};
-
-static void make_filename(const char name[], SkString* path) {
- path->set(name);
- for (int i = 0; name[i]; i++) {
- switch (name[i]) {
- case '/':
- case '\\':
- case ' ':
- case ':':
- path->writable_str()[i] = '-';
- break;
- default:
- break;
- }
- }
-}
-
-int main (int argc, char * const argv[]) {
- SkString outDir;
- SkBitmap::Config outConfig = SkBitmap::kARGB_8888_Config;
-
- char* const* stop = argv + argc;
- for (++argv; argv < stop; ++argv) {
- if (strcmp(*argv, "-o") == 0) {
- argv++;
- if (argv < stop && **argv) {
- outDir.set(*argv);
- if (outDir.c_str()[outDir.size() - 1] != '/') {
- outDir.append("/");
- }
- }
- } else if (strcmp(*argv, "-8888") == 0) {
- outConfig = SkBitmap::kARGB_8888_Config;
- } else if (strcmp(*argv, "-565") == 0) {
- outConfig = SkBitmap::kRGB_565_Config;
- } else if (strcmp(*argv, "-4444") == 0) {
- outConfig = SkBitmap::kARGB_4444_Config;
- } else if (strcmp(*argv, "-a8") == 0) {
- outConfig = SkBitmap::kA8_Config;
- }
- }
-
- Iter iter;
- SkBenchmark* bench;
- while ((bench = iter.next()) != NULL) {
- SkIPoint dim = bench->getSize();
- if (dim.fX <= 0 || dim.fY <= 0) {
- continue;
- }
-
- SkBitmap bm;
- bm.setConfig(outConfig, dim.fX, dim.fY);
- bm.allocPixels();
-
- SkCanvas canvas(bm);
- canvas.drawColor(SK_ColorWHITE);
- bench->draw(&canvas);
-
- SkString str;
- make_filename(bench->getName(), &str);
- str.prepend(outDir);
- str.append(".png");
- ::remove(str.c_str());
- SkImageEncoder::EncodeFile(str.c_str(), bm, SkImageEncoder::kPNG_Type,
- 100);
- }
-
- return 0;
-}