nasm waf util handles yasm builds now
parent
0ccf038589
commit
b7de0bcc78
|
@ -4,5 +4,6 @@ ENV CXX clang++
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
clang \
|
clang \
|
||||||
llvm-dev \
|
|
||||||
yasm
|
yasm
|
||||||
|
|
||||||
|
ADD https://waf.io/waf-2.0.14 /waf.py
|
||||||
|
|
|
@ -7,4 +7,4 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ${PWD}:/app
|
- ${PWD}:/app
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
command: python waf-2.0.14 configure build
|
command: python /waf.py configure build
|
||||||
|
|
170
waf-2.0.14
170
waf-2.0.14
File diff suppressed because one or more lines are too long
9
wscript
9
wscript
|
@ -4,17 +4,16 @@
|
||||||
|
|
||||||
|
|
||||||
def options(opt):
|
def options(opt):
|
||||||
opt.load('yasm')
|
opt.load('nasm')
|
||||||
opt.load('compiler_cxx')
|
opt.load('compiler_cxx')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def configure(conf):
|
def configure(conf):
|
||||||
conf.load('yasm')
|
conf.load('nasm')
|
||||||
conf.load('compiler_cxx')
|
conf.load('compiler_cxx')
|
||||||
|
|
||||||
|
|
||||||
def build(bld):
|
def build(bld):
|
||||||
bld.program(
|
bld.program(source='generation.cpp', target='generation.elf')
|
||||||
source='generation.cpp',
|
|
||||||
target='generation.elf')
|
|
||||||
bld(features='asm', source='seed.asm', target='seed')
|
bld(features='asm', source='seed.asm', target='seed')
|
||||||
|
|
Loading…
Reference in New Issue