Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix makefile variables #394

Merged
merged 1 commit into from
Aug 25, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@ setup:
cargo install bootimage

# Compilation options
output = video, # video, serial
keyboard = qwerty # qwerty, azerty, dvorak
output = video# video, serial
keyboard = qwerty# qwerty, azerty, dvorak

# Emulation options
nic = rtl8139 # rtl8139, pcnet
audio = sdl # sdl, coreaudio
nic = rtl8139# rtl8139, pcnet
audio = sdl# sdl, coreaudio
kvm = false

export MOROS_KEYBOARD = $(keyboard)
@@ -49,7 +49,7 @@ image: $(img)
dd conv=notrunc if=$(bin) of=$(img)

opts = -m 32 -drive file=$(img),format=raw \
-audiodev driver=$(audio),id=a0 -machine pcspk-audiodev=a0 \
-audiodev $(audio),id=a0 -machine pcspk-audiodev=a0 \
-netdev user,id=e0,hostfwd=tcp::8080-:80 -device $(nic),netdev=e0
ifeq ($(kvm),true)
opts += -cpu host -accel kvm