зеркало из https://github.com/mozilla/moz-skia.git
Remove some files from views.gyp that already being compiled into utils.gyp
(already done for Linux, this change does the same for Mac and Win). Review URL: http://codereview.appspot.com/4575044/ git-svn-id: http://skia.googlecode.com/svn/trunk@1654 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
2d7a60d8df
Коммит
52bbe140a3
|
@ -289,9 +289,6 @@
|
|||
|
||||
'../src/ports/SkThread_pthread.cpp',
|
||||
'../src/ports/SkTime_Unix.cpp',
|
||||
|
||||
# TODO(epoger): why are we building this here?
|
||||
'../src/utils/mac/SkCreateCGImageRef.cpp',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
|
|
|
@ -97,9 +97,6 @@
|
|||
# our code that calls it.
|
||||
# See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings
|
||||
'link_settings': {
|
||||
'sources': [
|
||||
'../src/images/SkImageDecoder_libpng.cpp',
|
||||
],
|
||||
'libraries': [
|
||||
'-lpng',
|
||||
],
|
||||
|
|
|
@ -73,25 +73,7 @@
|
|||
'../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation
|
||||
],
|
||||
'conditions': [
|
||||
[ 'OS == "win"', {
|
||||
'sources': [
|
||||
'../src/utils/win/SkOSWindow_Win.cpp',
|
||||
'../src/utils/win/skia_win.cpp',
|
||||
],
|
||||
}],
|
||||
[ 'OS == "mac"', {
|
||||
# TODO(epoger): why are we building these here instead of inheriting
|
||||
# them from utils.gyp?
|
||||
'sources': [
|
||||
'../include/utils/SkCGUtils.h',
|
||||
'../src/utils/mac/SkCreateCGImageRef.cpp',
|
||||
'../src/utils/mac/SkEGLContext_mac.cpp',
|
||||
'../src/utils/mac/skia_mac.cpp',
|
||||
'../src/utils/mac/SkOSWindow_Mac.cpp',
|
||||
],
|
||||
'include_dirs': [
|
||||
'../include/utils/mac',
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
|
||||
|
|
Загрузка…
Ссылка в новой задаче