removed neslib.h from library; sorts works w/ subfolder projects

This commit is contained in:
Steven Hugg 2019-05-03 20:13:08 -04:00
parent 8c7981b8d0
commit 5ba5fe830b
3 changed files with 11 additions and 4 deletions

View File

@ -81,6 +81,7 @@ TODO:
- vcs: break on # of lines changed (maybe using getRasterPosition?)
- profiler restarts when paused
- it's pretty easy to add a new file named like a library file (bcd.c)
- or have neslib.h in a subdirectory...
- put globals into view/controller objects
- upload binary files doesn't do what's expected, changing pulldown and whatnot
- chrome autostart audio: https://github.com/processing/p5.js-sound/issues/249
@ -130,6 +131,8 @@ TODO:
- upload multiple files/zip file to subdirectory
- allow "include graphics.asm" instead of "include project/graphics.asm"
- chrome looks blurry on vcs
- debug source lines are out of whack when >1 code segment
WEB WORKER FORMAT

File diff suppressed because one or more lines are too long

View File

@ -386,7 +386,10 @@ function gatherFiles(step:BuildStep, options?:BuildOptions) {
step.files = [path];
}
if (step.path && !step.prefix) {
step.prefix = step.path.split(/[./]/)[0]; // TODO
step.prefix = step.path;
var pos = step.prefix.lastIndexOf('.');
if (pos > 0)
step.prefix = step.prefix.substring(0, pos);
}
step.maxts = maxts;
return maxts;
@ -834,7 +837,7 @@ function parseCA65Listing(code, symbols, params, dbg) {
// .dbg line, "main.c", 1
var segLineMatch = /[.]segment\s+"(\w+)"/;
//var dbgLineMatch = /^([0-9A-F]+)([r]?)\s+(\d+)\s+[.]dbg\s+line,\s+\S+,\s+(\d+)/;
var dbgLineMatch = /^([0-9A-F]+)([r]?)\s+(\d+)\s+[.]dbg\s+line,\s+"(\w+[.]\w+)", (\d+)/;
var dbgLineMatch = /^([0-9A-F]+)([r]?)\s+(\d+)\s+[.]dbg\s+line,\s+"([^"]+)", (\d+)/;
var insnLineMatch = /^([0-9A-F]+)([r]?)\s+(\d+)\s+([0-9A-Fr ]*)\s*(.*)/;
var lines = [];
var linenum = 0;
@ -937,7 +940,7 @@ function linkLD65(step:BuildStep) {
'-D', '__EXEHDR__=0', // TODO
'-C', cfgfile,
'-Ln', 'main.vice',
//'--dbgfile', 'main.dbg',
//'--dbgfile', 'main.dbg', // TODO: get proper line numbers
'-o', 'main', '-m', 'main.map'].concat(step.args, libargs);
//console.log(args);
execMain(step, LD65, args);
@ -1082,6 +1085,7 @@ function compileCC65(step:BuildStep) {
'-Oirs', // don't inline CodeSizeFactor 200? (no -Oi)
'-Cl', // static locals
'-I', '/share/include',
'-I', '.',
'-D' + params.define,
step.path]);
if (errors.length)