diff options
| author | Tom Rondeau | 2011-06-13 12:35:42 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-06-13 12:35:42 -0400 |
| commit | 5ce630cbce6460b739b175257ce0d717095a55f4 (patch) | |
| tree | cabaca9d47ca1959f5e2861801a0ab160fe0be11 /grc/python | |
| parent | 86553ec410b1074bc4258b22027c5d31443d12ec (diff) | |
| parent | f0143c5d557ca7e4bf05c26f410da13520df91e5 (diff) | |
| download | gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.tar.gz gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.tar.bz2 gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.zip | |
Merge branch 'master' into 8psk
Conflicts:
gr-qtgui/lib/qtgui_time_sink_c.cc
gr-trellis/src/lib/Makefile.am
gr-trellis/src/lib/calc_metric.h
gr-trellis/src/lib/trellis.i
gr-trellis/src/lib/trellis_constellation_metrics_cf.i
gr-trellis/src/lib/trellis_metric_type.h
gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/Generator.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/grc/python/Generator.py b/grc/python/Generator.py index b31f0a009..2a2dfdd49 100644 --- a/grc/python/Generator.py +++ b/grc/python/Generator.py @@ -78,8 +78,9 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''') python_exe = sys.executable #when using wx gui on mac os, execute with pythonw - if self._generate_options == 'wx_gui' and 'darwin' in sys.platform.lower(): - python_exe += 'w' + #using pythonw is not necessary anymore, disabled below + #if self._generate_options == 'wx_gui' and 'darwin' in sys.platform.lower(): + # python_exe = 'pythonw' #setup the command args to run cmds = [python_exe, '-u', self.get_file_path()] #-u is unbuffered stdio |