Mercurial > lcfOS
diff python/ide/ide.py @ 343:11c5a8a70c02 devel
Fix ide
author | Windel Bouwman |
---|---|
date | Sat, 01 Mar 2014 16:27:52 +0100 |
parents | dcae6574c974 |
children |
line wrap: on
line diff
--- a/python/ide/ide.py Sat Mar 01 15:40:31 2014 +0100 +++ b/python/ide/ide.py Sat Mar 01 16:27:52 2014 +0100 @@ -6,12 +6,14 @@ import traceback import io -from qtwrapper import QtGui, QtCore, QtWidgets, pyqtSignal, get_icon, abspath, Qt +from qtwrapper import QtGui, QtCore, QtWidgets, pyqtSignal, get_icon +from qtwrapper import abspath, Qt # Compiler imports: p = os.path.join(os.path.dirname(__file__), '..') sys.path.insert(0, p) sys.path.insert(0, os.path.join(p, 'utils')) + import ppci from astviewer import AstViewer from codeedit import CodeEdit @@ -19,8 +21,8 @@ from disasm import Disassembly stutil = __import__('st-util') import zcc -import outstream -from target import armtarget +from ppci.outstream import BinaryOutputStream +from ppci.target.target_list import thumb_target def handle_exception(tp, v, tb): @@ -279,9 +281,9 @@ return fn = ce.FileName self.diag.clear() - outs = outstream.TextOutputStream() + outs = BinaryOutputStream() imps = [open(ce.FileName, 'r') for ce in self.allChildren() if ce.FileName and ce.FileName != fn] - if not zcc.zcc([open(fn, 'r')], imps, armtarget, outs, self.diag): + if not zcc.zcc([open(fn, 'r')], imps, thumb_target, outs, self.diag): # Set errors: self.builderrors.setErrorList(self.diag.diags) ce.setErrors(self.diag.diags)