diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-04-22 10:18:32 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-04-22 10:18:32 +0200 |
| commit | 263702b499ecc0862a81467b9130a259c67d767e (patch) | |
| tree | 439c0dde6ff84a190f541f46b420265d8322d976 | |
| parent | 29fdfacfded3af0f31a90e5e78f6c827a7a0cb9d (diff) | |
| download | qtlocation-mapboxgl-263702b499ecc0862a81467b9130a259c67d767e.tar.gz | |
remove library name deduplication from gyp
refs #155
| -rw-r--r-- | deps/gyp/pylib/gyp/generator/make.py | 3 | ||||
| -rw-r--r-- | linux/llmr-app.gyp | 2 | ||||
| -rw-r--r-- | llmr.gyp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/deps/gyp/pylib/gyp/generator/make.py b/deps/gyp/pylib/gyp/generator/make.py index b88a433d3d..b6f766d554 100644 --- a/deps/gyp/pylib/gyp/generator/make.py +++ b/deps/gyp/pylib/gyp/generator/make.py @@ -1447,7 +1447,8 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD libraries = spec.get('libraries') if libraries: # 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': libraries = self.xcode_settings.AdjustLibraries(libraries) self.WriteList(libraries, 'LIBS') diff --git a/linux/llmr-app.gyp b/linux/llmr-app.gyp index 2a03d90186..e12737b92c 100644 --- a/linux/llmr-app.gyp +++ b/linux/llmr-app.gyp @@ -42,7 +42,7 @@ '<@(curl_cflags)', ], 'link_settings': { - 'ldflags': [ + 'libraries': [ '<@(glfw3_libraries)', '<@(curl_libraries)', ], @@ -97,7 +97,7 @@ ] } }, { - 'ldflags': [ + 'libraries': [ '<@(png_libraries)', '<@(uv_libraries)', ] @@ -167,7 +167,7 @@ ] } }, { - 'ldflags': [ + 'libraries': [ '<@(png_libraries)', '<@(uv_libraries)', ] |