Move linker settings from standalone.gypi to pdfium.gyp, since they're needed when...
authorJohn Abd-El-Malek <jam@chromium.org>
Mon, 26 May 2014 18:48:05 +0000 (11:48 -0700)
committerJohn Abd-El-Malek <jam@chromium.org>
Mon, 26 May 2014 18:48:05 +0000 (11:48 -0700)
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/302453004

build/standalone.gypi
pdfium.gyp

index d919c16..ef85c5e 100644 (file)
         #   1 == /SUBSYSTEM:CONSOLE
         #   2 == /SUBSYSTEM:WINDOWS
         'SubSystem': '1',
-        'AdditionalDependencies': [
-          'advapi32.lib',
-          'gdi32.lib',
-          'user32.lib',
-        ],
       },
     },
     'xcode_settings': {
     }],  # 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']},
index 9f2cd3d..1b0bae0 100644 (file)
             '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',