From 1cab2921ab279367f8206cdadc9259d12e603548 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Wed, 18 Jan 2012 08:56:56 -0500 Subject: Skia merge (revision 3022) This CL has companion changes to account for API updates in... (1) frameworks/base (2) external/webkit Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d --- gyp/FileReaderApp.gyp | 78 ++++++++++ gyp/SampleApp.gyp | 281 +++++++++++++++++++++++++++++++++++ gyp/SimpleCocoaApp.gyp | 65 +++++++++ gyp/all.gyp | 41 ++++++ gyp/android_system.gyp | 21 +++ gyp/animator.gyp | 193 ++++++++++++++++++++++++ gyp/apptype_console.gypi | 21 +++ gyp/bench.gyp | 36 +++++ gyp/bench.gypi | 71 +++++++++ gyp/common.gypi | 70 +++++++++ gyp/common_conditions.gypi | 212 +++++++++++++++++++++++++++ gyp/common_variables.gypi | 25 ++++ gyp/core.gyp | 327 +++++++++++++++++++++++++++++++++++++++++ gyp/effects.gyp | 92 ++++++++++++ gyp/experimental.gyp | 31 ++++ gyp/freetype.gyp | 69 +++++++++ gyp/gm.gyp | 44 ++++++ gyp/gmslides.gypi | 55 +++++++ gyp/gpu.gyp | 356 +++++++++++++++++++++++++++++++++++++++++++++ gyp/iOSSampleApp.gyp | 279 +++++++++++++++++++++++++++++++++++ gyp/images.gyp | 149 +++++++++++++++++++ gyp/libtess.gyp | 59 ++++++++ gyp/opts.gyp | 81 +++++++++++ gyp/pdf.gyp | 66 +++++++++ gyp/ports.gyp | 114 +++++++++++++++ gyp/svg.gyp | 91 ++++++++++++ gyp/tests.gyp | 95 ++++++++++++ gyp/tools.gyp | 73 ++++++++++ gyp/utils.gyp | 161 ++++++++++++++++++++ gyp/views.gyp | 118 +++++++++++++++ gyp/xml.gyp | 58 ++++++++ gyp/xps.gyp | 67 +++++++++ gyp/zlib.gyp | 40 +++++ 33 files changed, 3539 insertions(+) create mode 100644 gyp/FileReaderApp.gyp create mode 100644 gyp/SampleApp.gyp create mode 100644 gyp/SimpleCocoaApp.gyp create mode 100644 gyp/all.gyp create mode 100644 gyp/android_system.gyp create mode 100644 gyp/animator.gyp create mode 100644 gyp/apptype_console.gypi create mode 100644 gyp/bench.gyp create mode 100644 gyp/bench.gypi create mode 100644 gyp/common.gypi create mode 100644 gyp/common_conditions.gypi create mode 100644 gyp/common_variables.gypi create mode 100644 gyp/core.gyp create mode 100644 gyp/effects.gyp create mode 100644 gyp/experimental.gyp create mode 100644 gyp/freetype.gyp create mode 100644 gyp/gm.gyp create mode 100644 gyp/gmslides.gypi create mode 100644 gyp/gpu.gyp create mode 100644 gyp/iOSSampleApp.gyp create mode 100644 gyp/images.gyp create mode 100644 gyp/libtess.gyp create mode 100644 gyp/opts.gyp create mode 100644 gyp/pdf.gyp create mode 100644 gyp/ports.gyp create mode 100644 gyp/svg.gyp create mode 100644 gyp/tests.gyp create mode 100644 gyp/tools.gyp create mode 100644 gyp/utils.gyp create mode 100644 gyp/views.gyp create mode 100644 gyp/xml.gyp create mode 100644 gyp/xps.gyp create mode 100644 gyp/zlib.gyp (limited to 'gyp') diff --git a/gyp/FileReaderApp.gyp b/gyp/FileReaderApp.gyp new file mode 100644 index 0000000..c5651c7 --- /dev/null +++ b/gyp/FileReaderApp.gyp @@ -0,0 +1,78 @@ +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'FileReaderApp', + 'type': 'executable', + 'mac_bundle' : 1, + + 'include_dirs' : [ + '../include/pipe', + '../experimental/FileReaderApp', + '../experimental/SimpleCocoaApp', + ], + 'sources': [ + '../experimental/FileReaderApp/ReaderView.cpp', + '../src/pipe/SkGPipeRead.cpp', + ], + 'sources!': [ + '../src/utils/mac/SkOSWindow_Mac.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'opts.gyp:opts', + 'ports.gyp:ports', + 'utils.gyp:utils', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions' : [ + # Only supports Mac currently + ['skia_os == "mac"', { + 'sources': [ + '../experimental/SimpleCocoaApp/SkNSWindow.mm', + '../experimental/SimpleCocoaApp/SkNSView.mm', + '../experimental/FileReaderApp/FileReaderApp-Info.plist', + '../experimental/FileReaderApp/FileReaderAppDelegate.mm', + '../experimental/FileReaderApp/FileReaderApp_Prefix.pch', + '../experimental/FileReaderApp/FileReaderWindow.mm', + '../experimental/FileReaderApp/main.m', + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + 'libraries!': [ + # Currently skia mac apps rely on Carbon and AGL for UI. Future + # apps should use Cocoa instead and dependencies on Carbon and AGL + # should eventually be removed + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/AGL.framework', + ], + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/FileReaderApp/FileReaderApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/FileReaderApp/English.lproj/InfoPlist.strings', + '../experimental/FileReaderApp/English.lproj/MainMenu.xib', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp new file mode 100644 index 0000000..fed4bf4 --- /dev/null +++ b/gyp/SampleApp.gyp @@ -0,0 +1,281 @@ + +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'SampleApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir? + '../gm', # needed to pull gm.h + '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer + '../samplecode', # To pull SampleApp.h and SampleCode.h + ], + 'includes': [ + 'gmslides.gypi', + ], + 'sources': [ + '../gm/gm.cpp', + '../gm/gm.h', + + '../samplecode/GMSampleView.h', + '../samplecode/ClockFaceView.cpp', + '../samplecode/OverView.cpp', + '../samplecode/Sample2PtRadial.cpp', + '../samplecode/SampleAAClip.cpp', + '../samplecode/SampleAAClip2.cpp', + '../samplecode/SampleAARects.cpp', + '../samplecode/SampleAARectModes.cpp', + '../samplecode/SampleAll.cpp', + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleApp.cpp', + '../samplecode/SampleArc.cpp', + '../samplecode/SampleAvoid.cpp', + '../samplecode/SampleBigBlur.cpp', + '../samplecode/SampleBigGradient.cpp', + '../samplecode/SampleBitmapRect.cpp', + '../samplecode/SampleBlur.cpp', + '../samplecode/SampleCamera.cpp', + '../samplecode/SampleCircle.cpp', + '../samplecode/SampleClip.cpp', + '../samplecode/SampleCode.h', + '../samplecode/SampleColorFilter.cpp', + '../samplecode/SampleComplexClip.cpp', + '../samplecode/SampleConcavePaths.cpp', + '../samplecode/SampleCull.cpp', + '../samplecode/SampleDecode.cpp', + '../samplecode/SampleDegenerateTwoPtRadials.cpp', + '../samplecode/SampleDither.cpp', + '../samplecode/SampleDitherBitmap.cpp', + '../samplecode/SampleDrawBitmap.cpp', + '../samplecode/SampleDrawLooper.cpp', + '../samplecode/SampleEffects.cpp', + '../samplecode/SampleEmboss.cpp', + '../samplecode/SampleEmptyPath.cpp', + '../samplecode/SampleEncode.cpp', + '../samplecode/SampleFillType.cpp', + '../samplecode/SampleFilter.cpp', + '../samplecode/SampleFilter2.cpp', + '../samplecode/SampleFontCache.cpp', + '../samplecode/SampleFontScalerTest.cpp', + '../samplecode/SampleFuzz.cpp', + '../samplecode/SampleGradients.cpp', + '../samplecode/SampleHairCurves.cpp', + '../samplecode/SampleHairline.cpp', + '../samplecode/SampleHairModes.cpp', + '../samplecode/SampleImage.cpp', + '../samplecode/SampleImageDir.cpp', + '../samplecode/SampleLayerMask.cpp', + '../samplecode/SampleLayers.cpp', + '../samplecode/SampleLCD.cpp', + '../samplecode/SampleLineClipper.cpp', + '../samplecode/SampleLines.cpp', + '../samplecode/SampleMeasure.cpp', + '../samplecode/SampleMipMap.cpp', + '../samplecode/SampleMovie.cpp', + '../samplecode/SampleNinePatch.cpp', + '../samplecode/SampleOvalTest.cpp', + '../samplecode/SampleOverflow.cpp', + '../samplecode/SamplePageFlip.cpp', + '../samplecode/SamplePatch.cpp', + '../samplecode/SamplePath.cpp', + '../samplecode/SamplePathClip.cpp', + '../samplecode/SamplePathEffects.cpp', + '../samplecode/SamplePicture.cpp', + '../samplecode/SamplePoints.cpp', + '../samplecode/SamplePolyToPoly.cpp', + '../samplecode/SampleRegion.cpp', + '../samplecode/SampleRepeatTile.cpp', + '../samplecode/SampleShaders.cpp', + '../samplecode/SampleShaderText.cpp', + '../samplecode/SampleShapes.cpp', + '../samplecode/SampleSkLayer.cpp', + '../samplecode/SampleSlides.cpp', + '../samplecode/SampleStrokePath.cpp', + '../samplecode/SampleStrokeText.cpp', + '../samplecode/SampleTests.cpp', + '../samplecode/SampleText.cpp', + '../samplecode/SampleTextAlpha.cpp', + '../samplecode/SampleTextBox.cpp', + '../samplecode/SampleTextEffects.cpp', + '../samplecode/SampleTextOnPath.cpp', + '../samplecode/SampleTextureDomain.cpp', + '../samplecode/SampleTiling.cpp', + '../samplecode/SampleTinyBitmap.cpp', + '../samplecode/SampleTriangles.cpp', + '../samplecode/SampleTypeface.cpp', + '../samplecode/SampleUnitMapper.cpp', + '../samplecode/SampleVertices.cpp', + '../samplecode/SampleXfermodes.cpp', + '../samplecode/SampleXfermodesBlur.cpp', + '../samplecode/TransitionView.cpp', + + # Dependencies for the pipe code in SampleApp + '../src/pipe/SkGPipeRead.cpp', + '../src/pipe/SkGPipeWrite.cpp', + + # DrawingBoard + #'../experimental/DrawingBoard/SkColorPalette.h', + #'../experimental/DrawingBoard/SkColorPalette.cpp', + #'../experimental/DrawingBoard/SkNetPipeController.h', + #'../experimental/DrawingBoard/SkNetPipeController.cpp', + #'../experimental/DrawingBoard/SampleDrawingClient.cpp', + #'../experimental/DrawingBoard/SampleDrawingServer.cpp', + + # Networking + #'../experimental/Networking/SampleNetPipeReader.cpp', + #'../experimental/Networking/SkSockets.cpp', + #'../experimental/Networking/SkSockets.h', + + # Debugger + '../experimental/Debugger/DebuggerViews.h', + '../experimental/Debugger/DebuggerContentView.cpp', + '../experimental/Debugger/DebuggerCommandsView.cpp', + '../experimental/Debugger/DebuggerStateView.cpp', + '../experimental/Debugger/SkDebugDumper.cpp', + '../experimental/Debugger/SkDebugDumper.h', + ], + 'sources!': [ + '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile + '../samplecode/SampleTests.cpp', #includes unknown file SkShaderExtras.h + '../samplecode/SampleWarp.cpp', + '../samplecode/SampleFontCache.cpp', + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'images.gyp:images', + 'ports.gyp:ports', + 'views.gyp:views', + 'utils.gyp:utils', + 'animator.gyp:animator', + 'xml.gyp:xml', + 'svg.gyp:svg', + 'experimental.gyp:experimental', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + 'pdf.gyp:pdf', + ], + 'conditions' : [ + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + }], + [ 'skia_os == "win"', { + 'sources!': [ + # require UNIX functions + '../samplecode/SampleEncode.cpp', + '../samplecode/SamplePageFlip.cpp', + ], + }], + [ 'skia_os == "mac"', { + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + 'sources': [ + # Sample App specific files + '../src/utils/mac/SampleApp-Info.plist', + '../src/utils/mac/SampleAppDelegate.h', + '../src/utils/mac/SampleAppDelegate.mm', + '../src/utils/mac/SkSampleNSView.h', + '../src/utils/mac/SkSampleNSView.mm', + + # Mac files + '../src/utils/mac/SkEventNotifier.h', + '../src/utils/mac/SkEventNotifier.mm', + '../src/utils/mac/skia_mac.mm', + '../src/utils/mac/SkNSView.h', + '../src/utils/mac/SkNSView.mm', + '../src/utils/mac/SkOptionsTableView.h', + '../src/utils/mac/SkOptionsTableView.mm', + '../src/utils/mac/SkOSWindow_Mac.mm', + '../src/utils/mac/SkTextFieldCell.h', + '../src/utils/mac/SkTextFieldCell.m', + ], + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../src/utils/mac/SampleApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../src/utils/mac/SampleApp.xib', + ], + }], + [ 'skia_os == "ios"', { + # TODO: This doesn't build properly yet, but it's getting there. + 'sources!': [ + '../samplecode/SampleDecode.cpp', + ], + 'sources': [ + '../experimental/iOSSampleApp/SkIOSNotifier.mm', + '../experimental/iOSSampleApp/SkTime_iOS.mm', + '../experimental/iOSSampleApp/SkUIDetailViewController.mm', + '../experimental/iOSSampleApp/SkUIRootViewController.mm', + '../experimental/iOSSampleApp/SkUIView_shell.mm', + + '../experimental/iOSSampleApp/iOSSampleApp_Prefix.pch', + '../experimental/iOSSampleApp/Shared/main.m', + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', + + '../src/utils/ios/SkOSWindow_iOS.mm', + '../src/utils/ios/SkImageDecoder_iOS.mm', + '../src/utils/ios/SkStream_NSData.mm', + '../src/utils/ios/SkOSFile_iOS.mm', + + '../src/utils/mac/SkCreateCGImageRef.cpp', + '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', + ], + 'include_dirs' : [ + '../experimental/iOSSampleApp', + '../experimental/iOSSampleApp/iPad', + '../experimental/iOSSampleApp/iPhone', + '../include/utils/ios', + '../../include/gpu', + ], + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', + ], + }], + [ 'skia_os == "android"', { + 'sources!': [ + '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleUnitMapper.cpp', + ], + 'dependencies!': [ + 'animator.gyp:animator', + 'experimental.gyp:experimental', + ], + 'dependencies': [ + 'android_system.gyp:sampleApp', + ], + }], + ], + 'msvs_settings': { + 'VCLinkerTool': { + 'SubSystem': '2', + 'AdditionalDependencies': [ + 'd3d9.lib', + ], + }, + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/SimpleCocoaApp.gyp b/gyp/SimpleCocoaApp.gyp new file mode 100644 index 0000000..ed35d54 --- /dev/null +++ b/gyp/SimpleCocoaApp.gyp @@ -0,0 +1,65 @@ +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'SimpleCocoaApp', + 'type': 'executable', + 'mac_bundle' : 1, + 'include_dirs' : [ + '../experimental/SimpleCocoaApp/', + ], + 'sources': [ + '../src/utils/mac/SkEventNotifier.h', + '../src/utils/mac/SkEventNotifier.mm', + '../src/utils/mac/skia_mac.mm', + '../src/utils/mac/SkNSView.h', + '../src/utils/mac/SkNSView.mm', + '../src/utils/mac/SkOptionsTableView.h', + '../src/utils/mac/SkOptionsTableView.mm', + '../src/utils/mac/SkOSWindow_Mac.mm', + '../src/utils/mac/SkTextFieldCell.h', + '../src/utils/mac/SkTextFieldCell.m', + + '../experimental/SimpleCocoaApp/SimpleApp-Info.plist', + '../experimental/SimpleCocoaApp/SimpleApp.h', + '../experimental/SimpleCocoaApp/SimpleApp.mm', + + ], + 'dependencies': [ + 'core.gyp:core', + 'opts.gyp:opts', + 'utils.gyp:utils', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'conditions' : [ + # Only supports Mac currently + [ 'skia_os == "mac"', { + 'sources': [ + '../include/utils/mac/SkCGUtils.h', + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + }, + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SimpleCocoaApp/SimpleApp-Info.plist', + }, + 'mac_bundle_resources' : [ + '../experimental/SimpleCocoaApp/SimpleApp.xib', + ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/all.gyp b/gyp/all.gyp new file mode 100644 index 0000000..37844bb --- /dev/null +++ b/gyp/all.gyp @@ -0,0 +1,41 @@ +# Creates a Makefile that is capable of building all executable targets. +# +# To build on Linux: +# ./gyp_skia && make all +# +# Building on other platforms not tested yet. +# + +# +# +# +# +# +# THIS IS DEPRECATED IN FAVOR OF trunk/skia.gyp !!! +# Questions? Contact epoger@google.com +# +# +# +# + +{ + 'targets': [ + { + 'target_name': 'all', + 'type': 'none', + 'dependencies': [ + 'bench.gyp:bench', + 'gm.gyp:gm', + 'SampleApp.gyp:SampleApp', + 'tests.gyp:tests', + 'tools.gyp:tools', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/android_system.gyp b/gyp/android_system.gyp new file mode 100644 index 0000000..27a82f3 --- /dev/null +++ b/gyp/android_system.gyp @@ -0,0 +1,21 @@ +# This GYP file stores the dependencies necessary to build Skia on the Android +# platform. The OS doesn't provide many stable libraries as part of the +# distribution so we have to build a few of them ourselves. +# +# We tried adding this gyp file to the android directory at the root of +# the Skia repo, but that resulted in the generated makefiles being created +# outside of the intended output directory. So to avoid this we created a simple +# shim here that includes the android_system.gypi file. The actual dependencies +# are defined and maintained in that gypi file. +# +# Also this assumes that the android directory is a sibling to the directory +# that contains your primary Skia checkout. If it is not then you must manually +# edit the includes below to specify the actual location of the android.gypi. +# This is due to the fact that we cannot use variables in an includes as the +# variable expansion step for gyp happens after the includes are processed. +{ + 'includes': [ + 'common.gypi', + '../../android/gyp/android.gypi', + ], +} \ No newline at end of file diff --git a/gyp/animator.gyp b/gyp/animator.gyp new file mode 100644 index 0000000..fc61e71 --- /dev/null +++ b/gyp/animator.gyp @@ -0,0 +1,193 @@ +{ + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'animator', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + '../include/effects', + '../include/animator', + '../include/views', + '../include/xml', + '../include/utils', + '../include/images', + ], + 'sources': [ + '../include/animator/SkAnimator.h', + '../include/animator/SkAnimatorView.h', + + '../src/animator/SkAnimate.h', + '../src/animator/SkAnimateActive.cpp', + '../src/animator/SkAnimateActive.h', + '../src/animator/SkAnimateBase.cpp', + '../src/animator/SkAnimateBase.h', + '../src/animator/SkAnimateField.cpp', + '../src/animator/SkAnimateMaker.cpp', + '../src/animator/SkAnimateMaker.h', + '../src/animator/SkAnimateProperties.h', + '../src/animator/SkAnimateSet.cpp', + '../src/animator/SkAnimateSet.h', + '../src/animator/SkAnimator.cpp', + '../src/animator/SkAnimatorScript.cpp', + '../src/animator/SkAnimatorScript.h', + #'../src/animator/SkAnimatorScript2.cpp', fails on windows + #'../src/animator/SkAnimatorScript2.h', + '../src/animator/SkBase64.cpp', + '../src/animator/SkBase64.h', + '../src/animator/SkBoundable.cpp', + '../src/animator/SkBoundable.h', + '../src/animator/SkBuildCondensedInfo.cpp', + #'../src/animator/SkCondensedDebug.cpp', fails on windows + #'../src/animator/SkCondensedRelease.cpp', + '../src/animator/SkDisplayable.cpp', + '../src/animator/SkDisplayable.h', + '../src/animator/SkDisplayAdd.cpp', + '../src/animator/SkDisplayAdd.h', + '../src/animator/SkDisplayApply.cpp', + '../src/animator/SkDisplayApply.h', + '../src/animator/SkDisplayBounds.cpp', + '../src/animator/SkDisplayBounds.h', + '../src/animator/SkDisplayEvent.cpp', + '../src/animator/SkDisplayEvent.h', + '../src/animator/SkDisplayEvents.cpp', + '../src/animator/SkDisplayEvents.h', + '../src/animator/SkDisplayInclude.cpp', + '../src/animator/SkDisplayInclude.h', + '../src/animator/SkDisplayInput.cpp', + '../src/animator/SkDisplayInput.h', + '../src/animator/SkDisplayList.cpp', + '../src/animator/SkDisplayList.h', + '../src/animator/SkDisplayMath.cpp', + '../src/animator/SkDisplayMath.h', + '../src/animator/SkDisplayMovie.cpp', + '../src/animator/SkDisplayMovie.h', + '../src/animator/SkDisplayNumber.cpp', + '../src/animator/SkDisplayNumber.h', + '../src/animator/SkDisplayPost.cpp', + '../src/animator/SkDisplayPost.h', + '../src/animator/SkDisplayRandom.cpp', + '../src/animator/SkDisplayRandom.h', + '../src/animator/SkDisplayScreenplay.cpp', + '../src/animator/SkDisplayScreenplay.h', + '../src/animator/SkDisplayType.cpp', + '../src/animator/SkDisplayType.h', + '../src/animator/SkDisplayTypes.cpp', + '../src/animator/SkDisplayTypes.h', + '../src/animator/SkDisplayXMLParser.cpp', + '../src/animator/SkDisplayXMLParser.h', + '../src/animator/SkDraw3D.cpp', + '../src/animator/SkDraw3D.h', + '../src/animator/SkDrawable.cpp', + '../src/animator/SkDrawable.h', + '../src/animator/SkDrawBitmap.cpp', + '../src/animator/SkDrawBitmap.h', + '../src/animator/SkDrawBlur.cpp', + '../src/animator/SkDrawBlur.h', + '../src/animator/SkDrawClip.cpp', + '../src/animator/SkDrawClip.h', + '../src/animator/SkDrawColor.cpp', + '../src/animator/SkDrawColor.h', + '../src/animator/SkDrawDash.cpp', + '../src/animator/SkDrawDash.h', + '../src/animator/SkDrawDiscrete.cpp', + '../src/animator/SkDrawDiscrete.h', + '../src/animator/SkDrawEmboss.cpp', + '../src/animator/SkDrawEmboss.h', + '../src/animator/SkDrawExtraPathEffect.cpp', + '../src/animator/SkDrawFull.cpp', + '../src/animator/SkDrawFull.h', + '../src/animator/SkDrawGradient.cpp', + '../src/animator/SkDrawGradient.h', + '../src/animator/SkDrawGroup.cpp', + '../src/animator/SkDrawGroup.h', + '../src/animator/SkDrawLine.cpp', + '../src/animator/SkDrawLine.h', + '../src/animator/SkDrawMatrix.cpp', + '../src/animator/SkDrawMatrix.h', + '../src/animator/SkDrawOval.cpp', + '../src/animator/SkDrawOval.h', + '../src/animator/SkDrawPaint.cpp', + '../src/animator/SkDrawPaint.h', + '../src/animator/SkDrawPath.cpp', + '../src/animator/SkDrawPath.h', + '../src/animator/SkDrawPoint.cpp', + '../src/animator/SkDrawPoint.h', + '../src/animator/SkDrawRectangle.cpp', + '../src/animator/SkDrawRectangle.h', + '../src/animator/SkDrawSaveLayer.cpp', + '../src/animator/SkDrawSaveLayer.h', + '../src/animator/SkDrawShader.cpp', + '../src/animator/SkDrawShader.h', + '../src/animator/SkDrawText.cpp', + '../src/animator/SkDrawText.h', + '../src/animator/SkDrawTextBox.cpp', + '../src/animator/SkDrawTextBox.h', + '../src/animator/SkDrawTo.cpp', + '../src/animator/SkDrawTo.h', + '../src/animator/SkDrawTransparentShader.cpp', + '../src/animator/SkDrawTransparentShader.h', + '../src/animator/SkDump.cpp', + '../src/animator/SkDump.h', + '../src/animator/SkExtras.h', + '../src/animator/SkGetCondensedInfo.cpp', + '../src/animator/SkHitClear.cpp', + '../src/animator/SkHitClear.h', + '../src/animator/SkHitTest.cpp', + '../src/animator/SkHitTest.h', + '../src/animator/SkIntArray.h', + '../src/animator/SkMatrixParts.cpp', + '../src/animator/SkMatrixParts.h', + '../src/animator/SkMemberInfo.cpp', + '../src/animator/SkMemberInfo.h', + '../src/animator/SkOpArray.cpp', + '../src/animator/SkOpArray.h', + '../src/animator/SkOperand.h', + '../src/animator/SkOperand2.h', + '../src/animator/SkOperandInterpolator.h', + '../src/animator/SkOperandIterpolator.cpp', + '../src/animator/SkPaintParts.cpp', + '../src/animator/SkPaintParts.h', + '../src/animator/SkParseSVGPath.cpp', + '../src/animator/SkPathParts.cpp', + '../src/animator/SkPathParts.h', + '../src/animator/SkPostParts.cpp', + '../src/animator/SkPostParts.h', + '../src/animator/SkScript.cpp', + '../src/animator/SkScript.h', + '../src/animator/SkScript2.h', + '../src/animator/SkScriptCallBack.h', + '../src/animator/SkScriptDecompile.cpp', + '../src/animator/SkScriptRuntime.cpp', + '../src/animator/SkScriptRuntime.h', + '../src/animator/SkScriptTokenizer.cpp', + '../src/animator/SkSnapshot.cpp', + '../src/animator/SkSnapshot.h', + '../src/animator/SkTDArray_Experimental.h', + '../src/animator/SkTextOnPath.cpp', + '../src/animator/SkTextOnPath.h', + '../src/animator/SkTextToPath.cpp', + '../src/animator/SkTextToPath.h', + '../src/animator/SkTime.cpp', + '../src/animator/SkTypedArray.cpp', + '../src/animator/SkTypedArray.h', + '../src/animator/SkXMLAnimatorWriter.cpp', + '../src/animator/SkXMLAnimatorWriter.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include/animator', + ], + }, + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi new file mode 100644 index 0000000..f2f6e1c --- /dev/null +++ b/gyp/apptype_console.gypi @@ -0,0 +1,21 @@ +# target_defaults used for executable targets that generate a console app +{ + 'target_defaults': { + 'msvs_settings': { + 'VCLinkerTool': { + #Allows for creation / output to console. + #Console (/SUBSYSTEM:CONSOLE) + 'SubSystem': '1', + + #Console app, use main/wmain + 'EntryPointSymbol': 'mainCRTStartup', + }, + }, + }, +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/bench.gyp b/gyp/bench.gyp new file mode 100644 index 0000000..0c5e2ea --- /dev/null +++ b/gyp/bench.gyp @@ -0,0 +1,36 @@ +# GYP file to build performance testbench. +# +{ + 'includes': [ + 'apptype_console.gypi', + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'bench', + 'type': 'executable', + 'include_dirs' : [ + '../src/core', + '../src/gpu', + ], + 'includes': [ + 'bench.gypi' + ], + 'dependencies': [ + 'core.gyp:core', + 'effects.gyp:effects', + 'gpu.gyp:gr', + 'gpu.gyp:skgr', + 'images.gyp:images', + 'ports.gyp:ports', + 'utils.gyp:utils', + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/bench.gypi b/gyp/bench.gypi new file mode 100644 index 0000000..5fbfef7 --- /dev/null +++ b/gyp/bench.gypi @@ -0,0 +1,71 @@ +# sources and conditions used in skia's bench.gyp and chromium's skia.gyp +# +{ + 'sources': [ + '../bench/benchmain.cpp', + '../bench/BenchTimer.h', + '../bench/BenchTimer.cpp', + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + '../bench/BenchGpuTimer_gl.h', + '../bench/BenchGpuTimer_gl.cpp', + + '../bench/SkBenchmark.h', + '../bench/SkBenchmark.cpp', + + '../bench/AAClipBench.cpp', + '../bench/BitmapBench.cpp', + '../bench/BlurBench.cpp', + '../bench/ChromeBench.cpp', + '../bench/DecodeBench.cpp', + '../bench/FontScalerBench.cpp', + '../bench/GradientBench.cpp', + '../bench/MathBench.cpp', + '../bench/MatrixBench.cpp', + '../bench/MutexBench.cpp', + '../bench/PathBench.cpp', + '../bench/RectBench.cpp', + '../bench/RepeatTileBench.cpp', + '../bench/ScalarBench.cpp', + '../bench/ShaderMaskBench.cpp', + '../bench/TextBench.cpp', + '../bench/VertBench.cpp', + ], + 'conditions': [ + [ 'skia_os != "mac"', { + 'sources!': [ + '../bench/BenchSysTimer_mach.h', + '../bench/BenchSysTimer_mach.cpp', + ], + }], + [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', { + 'sources!': [ + '../bench/BenchSysTimer_posix.h', + '../bench/BenchSysTimer_posix.cpp', + ], + }], + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'link_settings': { + 'libraries': [ + '-lrt', + ], + }, + }], + [ 'skia_os != "win"', { + 'sources!': [ + '../bench/BenchSysTimer_windows.h', + '../bench/BenchSysTimer_windows.cpp', + ], + }], + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/gyp/common.gypi b/gyp/common.gypi new file mode 100644 index 0000000..30424de --- /dev/null +++ b/gyp/common.gypi @@ -0,0 +1,70 @@ +# Copyright 2011 The Android Open Source Project +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'includes': [ + 'common_variables.gypi', + ], + 'target_defaults': { + + # Validate the 'skia_os' setting against 'OS', because only certain + # combinations work. You should only override 'skia_os' for certain + # situations, like building for iOS on a Mac. + 'variables': { + 'conditions': [ + ['skia_os != OS and not (skia_os == "ios" and OS == "mac")', + {'error': '', ], + }], + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', { + 'link_settings': { 'libraries': [ '-lz', ], }, + 'defines': [ 'SK_ZLIB_INCLUDE=', ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: -- cgit v1.1