3 files changed, 24 insertions, 6 deletions
diff --git a/Source/Applications/SampleApps/Makefile b/Source/Applications/SampleApps/Makefile
index 28dad49..6d12f3f 100644
--- a/Source/Applications/SampleApps/Makefile
+++ b/Source/Applications/SampleApps/Makefile
@@ -2,23 +2,31 @@
 
 ASM = nasm
 ASMFLAGS = -f elf
+
+CXX = g++
+CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I ../../Library/Common -I ../../Library/Userland -D THIS_IS_MELON_USERLAND
+
 LD = ld
 LDFLAGS = --entry=start -Ttext=40000000
 
-Applications = asmdemo
+Applications = asmdemo cxxdemo
 
 all: $(Applications)
 	echo "* Done with applications : $(Applications)"
 
 rebuild: mrproper all
 
-%: %.o
-	echo "* Linking $<..."
-	$(LD) $(LDFLAGS) $< -o $@
+%: %.cpp
+	echo "* Compiling $<..."
+	$(CXX) $(CXXFLAGS) -c $< -o $@.o
+	echo "* Linking $@.o..."
+	$(LD) $(LDFLAGS) ../../Library/Melon.o $@.o -o $@
 
-%.o: %.asm
+%: %.asm
 	echo "* Compiling $<..."
-	$(ASM) $(ASMFLAGS) -o $@ $<
+	$(ASM) $(ASMFLAGS) -o $@.o $<
+	echo "* Linking $@.o..."
+	$(LD) $(LDFLAGS) $@.o -o $@
 
 clean:
 	echo "* Removing object files..."
diff --git a/Source/Applications/SampleApps/asmdemo b/Source/Applications/SampleApps/asmdemo
deleted file mode 100755
index 9e6822d..0000000
--- a/Source/Applications/SampleApps/asmdemo
+++ /dev/null
diff --git a/Source/Applications/SampleApps/cxxdemo.cpp b/Source/Applications/SampleApps/cxxdemo.cpp
new file mode 100644
index 0000000..5d95d28
--- /dev/null
+++ b/Source/Applications/SampleApps/cxxdemo.cpp
@@ -0,0 +1,10 @@
+#include <Syscall/Syscall.wtf.h>
+#include <WChar.class.h>
+
+int main() {
+	for (char c = ' '; c <= 'z'; c++) {
+		syscall(0xFFFFFF02, (unsigned int)c);
+		putch(c);
+	}
+	putch('\n');
+}