diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-10-28 11:50:09 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-10-28 11:50:09 +0100 |
| commit | 9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c (patch) | |
| tree | f81efe30c84f1880dc8bd222a228132a93044191 /Source/Applications | |
| parent | eb0efe075de6c27512499bfc81bacb974e6146dd (diff) | |
| download | Melon-9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c.tar.gz Melon-9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c.zip | |
Revive Melon
Diffstat (limited to 'Source/Applications')
| -rw-r--r-- | Source/Applications/Demos/Makefile | 4 | ||||
| -rw-r--r-- | Source/Applications/PaperWork/Makefile | 4 | ||||
| -rw-r--r-- | Source/Applications/Shell/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/Applications/Demos/Makefile b/Source/Applications/Demos/Makefile index 82489ba..38c44f4 100644 --- a/Source/Applications/Demos/Makefile +++ b/Source/Applications/Demos/Makefile @@ -3,10 +3,10 @@ ASM = nasm ASMFLAGS = -f bin -CXX = g++ +CXX = i586-elf-g++ CXXFLAGS = -nostartfiles -nostdlib -ffreestanding -fno-exceptions -fno-rtti -I ../../Library/Common -I ../../Library/Interface -I ../../Library/Userland -D THIS_IS_MELON_USERLAND -LD = ld +LD = i586-elf-ld LDFLAGS = -T ../../Library/App.ld -L ../../Library Applications = asmdemo cxxdemo GOL diff --git a/Source/Applications/PaperWork/Makefile b/Source/Applications/PaperWork/Makefile index 5c379fb..766daa1 100644 --- a/Source/Applications/PaperWork/Makefile +++ b/Source/Applications/PaperWork/Makefile @@ -1,9 +1,9 @@ .PHONY: clean, mrproper -CXX = g++ +CXX = i586-elf-g++ CXXFLAGS = -nostartfiles -nostdlib -ffreestanding -fno-exceptions -fno-rtti -I ../../Library/Common -I ../../Library/Interface -I ../../Library/Userland -D THIS_IS_MELON_USERLAND -LD = ld +LD = i586-elf-ld LDFLAGS = -T ../../Library/App.ld -L ../../Library -Map Map.txt Objects = PaperWork.o diff --git a/Source/Applications/Shell/Makefile b/Source/Applications/Shell/Makefile index 867939f..3d7ca6b 100644 --- a/Source/Applications/Shell/Makefile +++ b/Source/Applications/Shell/Makefile @@ -1,9 +1,9 @@ .PHONY: clean, mrproper -CXX = g++ +CXX = i586-elf-g++ CXXFLAGS = -nostartfiles -nostdlib -ffreestanding -fno-exceptions -fno-rtti -I ../../Library/Common -I ../../Library/Interface -I ../../Library/Userland -D THIS_IS_MELON_USERLAND -LD = ld +LD = i586-elf-ld LDFLAGS = -T ../../Library/App.ld -L ../../Library Objects = Shell.class.o |