diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-05-26 11:48:05 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-05-26 11:48:05 -0700 |
| commit | 75392b3b36b8261a7ac5c8746359f738de9754e8 (patch) | |
| tree | 10a6d3864b817abaafab9377708ecf88b0f4f804 | |
| parent | 5dc4f24637d353d4d777c251f6d8c5746e062e7e (diff) | |
| download | pdfium-75392b3b36b8261a7ac5c8746359f738de9754e8.tar.xz | |
Move linker settings from standalone.gypi to pdfium.gyp, since they're needed when linking pdfium_test as part of other projects' gyp files as well where standalone.gypi isn't used.
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/302453004
| -rw-r--r-- | build/standalone.gypi | 11 | ||||
| -rw-r--r-- | pdfium.gyp | 17 |
2 files changed, 17 insertions, 11 deletions
diff --git a/build/standalone.gypi b/build/standalone.gypi index d919c1669c..ef85c5e923 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -186,11 +186,6 @@ # 1 == /SUBSYSTEM:CONSOLE # 2 == /SUBSYSTEM:WINDOWS 'SubSystem': '1', - 'AdditionalDependencies': [ - 'advapi32.lib', - 'gdi32.lib', - 'user32.lib', - ], }, }, 'xcode_settings': { @@ -242,12 +237,6 @@ }], # OS=="win" ['OS=="mac"', { 'target_defaults': { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', - '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', - ], - }, 'target_conditions': [ ['_type!="static_library"', { 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, diff --git a/pdfium.gyp b/pdfium.gyp index 9f2cd3d228..1b0bae01b0 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -119,7 +119,24 @@ 'fpdfsdk/src/fpdfsdkdll.rc', ], }], + ['OS=="mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', + ], + }, + }], ], + 'msvs_settings': { + 'VCLinkerTool': { + 'AdditionalDependencies': [ + 'advapi32.lib', + 'gdi32.lib', + 'user32.lib', + ], + }, + }, }, { 'target_name': 'fdrm', |