diff options
| author | Keith Packard <keithp@keithp.com> | 2009-12-11 09:22:22 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-11 09:22:22 -0800 |
| commit | d3e054ac07dae12a82ad764b0622fddbef4b9ec5 (patch) | |
| tree | ebab8e7ba6ac4052e191de65105d658b5393bf62 /hw | |
| parent | 12fb31815db9de9c01f2d4155a2b74531777c0bf (diff) | |
| parent | 97a6454ea57587db490873fee8ff0f899882972d (diff) | |
Merge remote branch 'jeremyhu/master'
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xquartz/mach-startup/stub.c | 3 | ||||
| -rw-r--r-- | hw/xquartz/pbproxy/Makefile.am | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c index c8686e78f..89f9e1058 100644 --- a/hw/xquartz/mach-startup/stub.c +++ b/hw/xquartz/mach-startup/stub.c @@ -232,8 +232,9 @@ int main(int argc, char **argv, char **envp) { kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp); if(kr != KERN_SUCCESS) { - fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name); pid_t child; + + fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name); set_x11_path(); /* This forking is ugly and will be cleaned up later */ diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am index e1c537fbb..02da6b265 100644 --- a/hw/xquartz/pbproxy/Makefile.am +++ b/hw/xquartz/pbproxy/Makefile.am @@ -15,6 +15,9 @@ if STANDALONE_XPBPROXY bin_PROGRAMS = xpbproxy xpbproxy_SOURCES = app-main.m xpbproxy_LDADD = libxpbproxy.la +xpbproxy_LDFLAGS = -Wl,-framework,Cocoa + +AM_CPPFLAGS += -DSTANDALONE_XPBPROXY endif |