tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put png_cflags in cflags not includes to avoid gyp double completing with -I

Browse Source
This commit is contained in:
Dane Springmeyer
2014-02-04 11:33:18 -08:00
parent 023edc13eb
commit 74aeab8ac7
1 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
llmr.gyp
View File

@@ -19,15 +19,41 @@
'PUBLIC_HEADERS_FOLDER_PATH': 'include'
},
'include_dirs':[
'./include',
'./include'
],
'cflags': [
'<@(png_cflags)'
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(png_libraries)'
]
}
}, {
'libraries': [
'<@(png_libraries)'
]
}]
],
'direct_dependent_settings': {
'include_dirs':[
'./include',
'./include'
],
'cflags': [
'<@(png_cflags)'
],
# workaround xcode bug
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {
@@ -60,15 +86,41 @@
'PUBLIC_HEADERS_FOLDER_PATH': 'include'
},
'include_dirs':[
'./include',
'./include'
],
'cflags': [
'<@(png_cflags)'
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(png_libraries)'
]
}
}, {
'libraries': [
'<@(png_libraries)'
]
}]
],
'direct_dependent_settings': {
'include_dirs':[
'./include',
'./include'
],
'cflags': [
'<@(png_cflags)'
],
# workaround xcode bug
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {