|
Line
Link Here
|
| 0 |
-- brackets-shell/appshell.gyp |
0 |
++ brackets-shell/appshell.gyp |
|
Lines 339-354
Link Here
|
| 339 |
'<@(includes_linux)', |
339 |
'<@(includes_linux)', |
| 340 |
'<@(appshell_sources_linux)', |
340 |
'<@(appshell_sources_linux)', |
| 341 |
], |
341 |
], |
|
|
342 |
'dependencies': [ |
| 343 |
'gtk' |
| 344 |
], |
| 342 |
'link_settings': { |
345 |
'link_settings': { |
| 343 |
'ldflags': [ |
346 |
'ldflags': [ |
| 344 |
'<!@(<(pkg-config) --libs-only-other gtk+-2.0 gthread-2.0)', |
347 |
# Look for libcef.so in the current directory. Path can also be |
|
|
348 |
# specified using the LD_LIBRARY_PATH environment variable. |
| 345 |
'-Wl,-rpath,\$$ORIGIN/lib', |
349 |
'-Wl,-rpath,\$$ORIGIN/lib', |
| 346 |
'<(march)' |
|
|
| 347 |
], |
350 |
], |
| 348 |
'libraries': [ |
351 |
'libraries': [ |
| 349 |
'<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)', |
352 |
"$(BUILDTYPE)/libcef.so", |
| 350 |
'$(BUILDTYPE)/libcef.so', |
353 |
"appshell_extensions_js.o", |
| 351 |
'appshell_extensions_js.o', |
354 |
"-lX11", |
| 352 |
], |
355 |
], |
| 353 |
}, |
356 |
}, |
| 354 |
}], |
357 |
}], |
|
Lines 497-502
Link Here
|
| 497 |
}, # target appshell_helper_app |
500 |
}, # target appshell_helper_app |
| 498 |
], |
501 |
], |
| 499 |
}], # OS=="mac" |
502 |
}], # OS=="mac" |
|
|
503 |
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
| 504 |
'targets': [ |
| 505 |
{ |
| 506 |
'target_name': 'gtk', |
| 507 |
'type': 'none', |
| 508 |
'variables': { |
| 509 |
# gtk requires gmodule, but it does not list it as a dependency |
| 510 |
# in some misconfigured systems. |
| 511 |
'gtk_packages': 'gmodule-2.0 gtk+-2.0 gthread-2.0', |
| 512 |
}, |
| 513 |
'direct_dependent_settings': { |
| 514 |
'cflags': [ |
| 515 |
'$(shell <(pkg-config) --cflags <(gtk_packages))', |
| 516 |
], |
| 517 |
}, |
| 518 |
'link_settings': { |
| 519 |
'ldflags': [ |
| 520 |
'$(shell <(pkg-config) --libs-only-L --libs-only-other <(gtk_packages))', |
| 521 |
], |
| 522 |
'libraries': [ |
| 523 |
'$(shell <(pkg-config) --libs-only-l <(gtk_packages))', |
| 524 |
'-lpthread', |
| 525 |
], |
| 526 |
}, |
| 527 |
}, |
| 528 |
], |
| 529 |
}], # OS=="linux" or OS=="freebsd" or OS=="openbsd" |
| 500 |
['target_arch=="ia32"', { |
530 |
['target_arch=="ia32"', { |
| 501 |
'variables': { |
531 |
'variables': { |
| 502 |
'output_bfd': 'elf32-i386', |
532 |
'output_bfd': 'elf32-i386', |
|
Lines 517-519
Link Here
|
| 517 |
}], |
547 |
}], |
| 518 |
], |
548 |
], |
| 519 |
} |
549 |
} |
|
|
550 |
|
