summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-10-29 13:26:54 +0100
committerAlexis211 <alexis211@gmail.com>2009-10-29 13:26:54 +0100
commit962b8e892ce060b9690a35b0bcf6bae9a882c330 (patch)
tree3992f868eab544e041f51646a3015ef623e6f2a4
parent4cab9cdad95aba4934b22872c94e44fab759250c (diff)
downloadMelon-962b8e892ce060b9690a35b0bcf6bae9a882c330.tar.gz
Melon-962b8e892ce060b9690a35b0bcf6bae9a882c330.zip
Arranged some paperwork
-rw-r--r--Makefile1
-rw-r--r--README5
-rw-r--r--Source/Library/Common/WChar.class.cpp5
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0052621..4a3e732 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ $(RamFS):
Source/Tools/MakeRamFS/MakeRamFS $(RamFS) $(RamFSFiles)
floppy: $(Files)
+ mkdir Mount
sudo mount $(Floppy) Mount -o loop
sudo cp Grub-menu.cfg Mount/boot/menu.cfg
for f in $(Files); do \
diff --git a/README b/README
index 56a010a..6d00f09 100644
--- a/README
+++ b/README
@@ -3,6 +3,11 @@ Welcome ! It seems you are intrested in my Melon OS...
** HOW TO BUILD MELON : **
This is supposed to work in a Linux environment. Maybee it could work on *BSD, or Cygwin, but that wasn't tested.
+You need :
+- GCC
+- Nasm
+- Qemu or Bochs for testing (Qemu works better, debugging is planned for bochs)
+
If you haven't yet downloaded the source code, then commit the GIT repository :
$ git clone git://github.com/Alexis211/Melon.git
diff --git a/Source/Library/Common/WChar.class.cpp b/Source/Library/Common/WChar.class.cpp
index 5485bb8..f5bd5bc 100644
--- a/Source/Library/Common/WChar.class.cpp
+++ b/Source/Library/Common/WChar.class.cpp
@@ -59,8 +59,9 @@ u32int WChar::utfLen(const char* c, u8int encoding) {
}
void WChar::affectAscii(char c) {
- if (c >= 0) value = c;
- else value = CP437[c + 128];
+ s32int a = c;
+ if (a >= 0) value = a;
+ else value = CP437[a + 128];
}
u32int WChar::affectUtf8(const char* c) { //Returns the number of bytes for the character