From 712a26f1ba76210a38b26e2719c4f15f9a360838 Mon Sep 17 00:00:00 2001 From: Simon Holmberg Date: Sun, 30 Nov 2014 15:52:16 +0100 Subject: [PATCH] Fixed makefile --- .gitignore | 1 + Makefile | 6 +++--- nibbles_asm | Bin 0 -> 16799 bytes nibbles_asm_start | Bin 0 -> 9996 bytes 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100755 nibbles_asm create mode 100755 nibbles_asm_start diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5761abc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.o diff --git a/Makefile b/Makefile index 52dd91d..a9671f3 100644 --- a/Makefile +++ b/Makefile @@ -8,14 +8,14 @@ all: nibbles_asm nibbles_asm_start gcc -Os -std=c11 -m32 -march=i686 -Wall -g -c $< # Rule for compiling assembly source -.s.o: - #as -gstabs $^ -o $@ +.S.o: + #as --32 -gstabs $^ -o $@ gcc -m32 -march=i686 -c $< # C game nibbles_c: main.o cnibbles.o - gcc -lcurses $^ -o $@ + gcc -m32 -lcurses $^ -o $@ # ASM game nibbles_asm: main.o nibbles.o helpers.o diff --git a/nibbles_asm b/nibbles_asm new file mode 100755 index 0000000000000000000000000000000000000000..683b409d4dccb03f9779873b51ec5c00952a535a GIT binary patch literal 16799 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 literal 0 HcmV?d00001 diff --git a/nibbles_asm_start b/nibbles_asm_start new file mode 100755 index 0000000000000000000000000000000000000000..5d003ace5219e701cf96010dd157214a6acb8894 GIT binary patch literal 9996 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 K?{NxV*?$8p9j^ia literal 0 HcmV?d00001