diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-14 10:22:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-14 10:22:19 +0000 |
| commit | 9b17452909d3140fa33a753cadfaa6e9006b9685 (patch) | |
| tree | 4abbb4b660ee9125cb0c20dab5a1c8de9f5a4a2d /xorg-server/hw/xquartz | |
| parent | 75d2bbcf0f39b9c85bc270728343f61dabebce2d (diff) | |
| download | vcxsrv-9b17452909d3140fa33a753cadfaa6e9006b9685.tar.gz vcxsrv-9b17452909d3140fa33a753cadfaa6e9006b9685.tar.bz2 vcxsrv-9b17452909d3140fa33a753cadfaa6e9006b9685.zip | |
Git update 14/12/2009
Diffstat (limited to 'xorg-server/hw/xquartz')
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/stub.c | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/pbproxy/Makefile.am | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c index c8686e78f..89f9e1058 100644 --- a/xorg-server/hw/xquartz/mach-startup/stub.c +++ b/xorg-server/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/xorg-server/hw/xquartz/pbproxy/Makefile.am b/xorg-server/hw/xquartz/pbproxy/Makefile.am index e1c537fbb..02da6b265 100644 --- a/xorg-server/hw/xquartz/pbproxy/Makefile.am +++ b/xorg-server/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 |