summaryrefslogtreecommitdiff
path: root/Source/Library
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-10-28 11:50:09 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-10-28 11:50:09 +0100
commit9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c (patch)
treef81efe30c84f1880dc8bd222a228132a93044191 /Source/Library
parenteb0efe075de6c27512499bfc81bacb974e6146dd (diff)
downloadMelon-9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c.tar.gz
Melon-9bd6fc9b337d760e23ebc9cb9b954a6205bbaa1c.zip
Revive Melon
Diffstat (limited to 'Source/Library')
-rw-r--r--Source/Library/Common/types.h2
-rw-r--r--Source/Library/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Library/Common/types.h b/Source/Library/Common/types.h
index 843a8ca..5a3f076 100644
--- a/Source/Library/Common/types.h
+++ b/Source/Library/Common/types.h
@@ -12,7 +12,7 @@ typedef long long s64int;
typedef int s32int;
typedef short s16int;
typedef char s8int;
-typedef unsigned int size_t;
+typedef long unsigned int size_t;
#define U64 unsigned long long
#define S64 long long
diff --git a/Source/Library/Makefile b/Source/Library/Makefile
index 6e3e269..4a8d4ea 100644
--- a/Source/Library/Makefile
+++ b/Source/Library/Makefile
@@ -1,12 +1,12 @@
.PHONY: clean, mrproper
-CXX = g++
+CXX = i586-elf-g++
CXXFLAGS = -nostartfiles -nostdlib -ffreestanding -fno-exceptions -fno-rtti -I Common -I Userland -I Interface -D THIS_IS_MELON_USERLAND -D RANDOM_SEED=1`date +%N`LL
ASM = nasm
ASMFLAGS = -f elf
-LD = ld
+LD = i586-elf-ld
Objects = Common/WChar.class.uo \
Common/CMem.ns.uo \