Browse Source

nasm waf util handles yasm builds now

master
JoYo 3 years ago
parent
commit
b7de0bcc78
  1. 3
      Dockerfile
  2. 2
      docker-compose.yaml
  3. 170
      waf-2.0.14
  4. 9
      wscript

3
Dockerfile

@ -4,5 +4,6 @@ ENV CXX clang++
RUN apt-get update && apt-get install -y \
clang \
llvm-dev \
yasm
ADD https://waf.io/waf-2.0.14 /waf.py

2
docker-compose.yaml

@ -7,4 +7,4 @@ services:
volumes:
- ${PWD}:/app
working_dir: /app
command: python waf-2.0.14 configure build
command: python /waf.py configure build

170
waf-2.0.14

File diff suppressed because one or more lines are too long

9
wscript

@ -4,17 +4,16 @@
def options(opt):
opt.load('yasm')
opt.load('nasm')
opt.load('compiler_cxx')
def configure(conf):
conf.load('yasm')
conf.load('nasm')
conf.load('compiler_cxx')
def build(bld):
bld.program(
source='generation.cpp',
target='generation.elf')
bld.program(source='generation.cpp', target='generation.elf')
bld(features='asm', source='seed.asm', target='seed')

Loading…
Cancel
Save