Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

added -sourcepath=src/shiny and -sourcepath=. to the ooc flags so tha…

…t .ooc's can 'import foo' instead of 'import src/shiny/foo'
  • Loading branch information...
commit 19e685aa4efe5da777f733e972d553dee988c0f1 1 parent 1709ef6
@tsion tsion authored
Showing with 7 additions and 4 deletions.
  1. +1 −1  SConstruct
  2. +5 −2 src/shiny/SConscript
  3. +1 −1  src/shiny/init/init.ooc
View
2  SConstruct
@@ -25,7 +25,7 @@ env = Environment(
LINK='ld',
LINKFLAGS=['-melf_i386', '-nostdlib'],
OOC='ooc',
- OOCFLAGS=['-c', '-gcc', '-driver=sequence', '-nomain', '-gc=off', '+-m32', '+-nostdinc', '+-ffreestanding', '-Iinclude'],
+ OOCFLAGS=['-c', '-gcc', '-driver=sequence', '-nomain', '-gc=off', '+-m32', '+-nostdinc', '+-ffreestanding', '-Iinclude', '-sourcepath=.'],
ENV = os.environ, # pass outside env to build so ooc is in PATH and OOC_DIST exists
)
View
7 src/shiny/SConscript
@@ -10,10 +10,13 @@ Export('sources', 'shiny')
SConscript('boot/%s/SConscript' % arch)
SConscript('hal/%s/SConscript' % arch)
-ooc = env.ooc('ooc.lib', 'init/init.ooc')
+ooc = env.Clone()
+ooc.Append(OOCFLAGS=['-sourcepath=src/shiny'])
+
+ooclib = ooc.ooc('ooc.lib', 'init/init.ooc')
sources += [
- ooc,
+ ooclib
]
shinyexe = shiny.Program('shiny', sources)
View
2  src/shiny/init/init.ooc
@@ -1,7 +1,7 @@
include shiny/shiny
include shiny/hal/hal
-import src/shiny/display
+import display
MultiBootInfoT: cover from multiboot_info_t {
cmdline, boot_loader_name: extern UInt
Please sign in to comment.
Something went wrong with that request. Please try again.