3
deps/gyp/pylib/gyp/generator/make.py
vendored
3
deps/gyp/pylib/gyp/generator/make.py
vendored
@@ -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')
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
'<@(curl_cflags)',
|
'<@(curl_cflags)',
|
||||||
],
|
],
|
||||||
'link_settings': {
|
'link_settings': {
|
||||||
'ldflags': [
|
'libraries': [
|
||||||
'<@(glfw3_libraries)',
|
'<@(glfw3_libraries)',
|
||||||
'<@(curl_libraries)',
|
'<@(curl_libraries)',
|
||||||
],
|
],
|
||||||
|
|||||||
4
llmr.gyp
4
llmr.gyp
@@ -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)',
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user