remove library name deduplication from gyp

refs #155
This commit is contained in:
Konstantin Käfer
2014-04-22 10:18:32 +02:00
parent 29fdfacfde
commit 263702b499
3 changed files with 5 additions and 4 deletions

View File

@@ -1447,7 +1447,8 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
libraries = spec.get('libraries') libraries = spec.get('libraries')
if libraries: if libraries:
# Remove duplicate entries # Remove duplicate entries
libraries = gyp.common.uniquer(libraries) # Commented out due to https://code.google.com/p/gyp/issues/detail?id=419
# libraries = gyp.common.uniquer(libraries)
if self.flavor == 'mac': if self.flavor == 'mac':
libraries = self.xcode_settings.AdjustLibraries(libraries) libraries = self.xcode_settings.AdjustLibraries(libraries)
self.WriteList(libraries, 'LIBS') self.WriteList(libraries, 'LIBS')

View File

@@ -42,7 +42,7 @@
'<@(curl_cflags)', '<@(curl_cflags)',
], ],
'link_settings': { 'link_settings': {
'ldflags': [ 'libraries': [
'<@(glfw3_libraries)', '<@(glfw3_libraries)',
'<@(curl_libraries)', '<@(curl_libraries)',
], ],

View File

@@ -97,7 +97,7 @@
] ]
} }
}, { }, {
'ldflags': [ 'libraries': [
'<@(png_libraries)', '<@(png_libraries)',
'<@(uv_libraries)', '<@(uv_libraries)',
] ]
@@ -167,7 +167,7 @@
] ]
} }
}, { }, {
'ldflags': [ 'libraries': [
'<@(png_libraries)', '<@(png_libraries)',
'<@(uv_libraries)', '<@(uv_libraries)',
] ]