diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-07-16 16:16:38 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-02-23 18:41:49 +0000 |
| commit | 5c7c183026d6b44be1eefc2aac8a8ba5648ba27f (patch) | |
| tree | 4e3bfb02e73ce88cef14a0e6551bdac8be4c8af9 | |
| parent | 11b50ddaeb9e074ff3d5a29ab0bac1af457d4e28 (diff) | |
Fix up local client starting for cygwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rw-r--r-- | main.cc | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -300,10 +300,11 @@ class CMyWizard : public CWizard return; SendMessage(cbwnd, CB_RESETCONTENT, 0, 0); SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "xterm"); + SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "~/.xinitrc"); + SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "openbox-session"); + SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "wmaker"); SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "startkde"); SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "gnome-session"); - SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) ".xinitrc"); - SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "wmaker"); SendMessage(cbwnd, CB_SETCURSEL, 0, 0); } /// @brief Fill protocol box with default values. @@ -562,8 +563,15 @@ class CMyWizard : public CWizard snprintf(cmdline,512,"ssh -Y %s %s", host.c_str(),config.program.c_str()); client += cmdline; - } else - client += config.program.c_str(); + } else { +#if defined (__CYGWIN__) + client = "bash -l -c \"" + config.program + "\""; +#elif defined (__MINGW__) + client = config.program.c_str(); +#else +#error "Don't know how to start child process on target" +#endif + } } // Prepare program startup |