From a13cbc2fb1473f22e58882895819983064cf8adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergiusz=20=27q3k=27=20Baza=C5=84ski?= <q3k@q3k.org>
Date: Tue, 23 Apr 2013 14:15:31 +0200
Subject: [PATCH] Make it build.

---
 Kernel/Makefile                 | 10 +++++-----
 Kernel/src/Lua/Makefile         |  4 ++--
 Kernel/src/Tier1/CKernelML4.cpp |  2 +-
 Loader/Makefile                 |  5 ++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Kernel/Makefile b/Kernel/Makefile
index ab1fef5..ae8e6e5 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -12,12 +12,12 @@
 default: emulate-nohdd
 
 SHELL:=/bin/bash
-ENV:=/usr/xdev/bin
+#ENV:=/usr/xdev/bin
 TARGET:=x86_64-elf
-CC:=$(ENV)/$(TARGET)-gcc
-CX:=$(ENV)/$(TARGET)-g++
+CC:=$(TARGET)-gcc
+CX:=$(TARGET)-g++
 AS:=nasm
-LD:=$(ENV)/$(TARGET)-ld
+LD:=$(TARGET)-ld
 
 # -O2 sets -foptimize-sibling-calls which breaks code...
 CFLAGS:=-m64 -mcmodel=large -Wall -Werror -nostdlib -nostartfiles -nodefaultlibs -std=c99 -g
@@ -132,7 +132,7 @@ emulate-nohdd: kernel.bin
 	@echo "[i] Building loader..."
 	@pushd ../Loader > /dev/null && $(MAKE) -f Makefile loader.bin && popd > /dev/null
 	@echo "[i] Starting QEMU..."
-	@qemu-system-x86_64 --no-kvm -d int -smp 4 -kernel ../Loader/loader.bin -initrd kernel.bin
+	@qemu-system-x86_64 $(QEMU_FLAGS) --no-kvm -d int -smp 4 -kernel ../Loader/loader.bin -initrd kernel.bin
 
 emulate: hdd.img
 	@echo "[i] Starting QEmu..."
diff --git a/Kernel/src/Lua/Makefile b/Kernel/src/Lua/Makefile
index 1c98fe1..1b207e5 100644
--- a/Kernel/src/Lua/Makefile
+++ b/Kernel/src/Lua/Makefile
@@ -6,13 +6,13 @@
 # Your platform. See PLATS for possible values.
 PLAT= cucumber-kernel
 
-CC= /usr/xdev/bin/x86_64-elf-gcc
+CC=x86_64-elf-gcc
 CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
 LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
 LIBS= -lm $(SYSLIBS) $(MYLIBS)
 
 AR= ar rcu
-RANLIB= /usr/xdev/bin/x86_64-elf-ranlib
+RANLIB=x86_64-elf-ranlib
 RM= rm -f
 
 SYSCFLAGS=
diff --git a/Kernel/src/Tier1/CKernelML4.cpp b/Kernel/src/Tier1/CKernelML4.cpp
index 047432e..110a832 100644
--- a/Kernel/src/Tier1/CKernelML4.cpp
+++ b/Kernel/src/Tier1/CKernelML4.cpp
@@ -68,7 +68,7 @@ void CKernelML4::PopulateCommonPointers(void)
     for (u16 i = 0; i < 256; i++)
         LowmemDirectory->Entries[i].Present = 0;
 
-    POPULATE_PAGING_ENTRY(LowmemDPT-Entries[0], paging_scratch_get_physical(LowmemDirectory));
+    POPULATE_PAGING_ENTRY(LowmemDPT->Entries[0], paging_scratch_get_physical(LowmemDirectory));
     ASSERT_ALIGNED(paging_scratch_get_physical(LowmemDirectory));
 
     T_PAGING_TAB *LowmemTable = (T_PAGING_TAB*)kmalloc_aligned(sizeof(T_PAGING_TAB));
diff --git a/Loader/Makefile b/Loader/Makefile
index b59f90f..d2c4bc6 100644
--- a/Loader/Makefile
+++ b/Loader/Makefile
@@ -12,11 +12,10 @@
 default: emulate-nohdd
 
 SHELL:=/bin/bash
-ENV:=/usr/xdev/bin
 TARGET:=i586-elf
-CC:=$(ENV)/$(TARGET)-gcc
+CC:=$(TARGET)-gcc
 AS:=nasm
-LD:=$(ENV)/$(TARGET)-ld
+LD:=$(TARGET)-ld
 
 # -O2 sets -foptimize-sibling-calls which breaks code...
 CFLAGS:=-Wall -Werror -nostdlib -nostartfiles -nodefaultlibs -std=c99 -g