diff --git a/Makefile b/Makefile index 2358625..0757fc3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # $Id$ # The System Makefile (C) 2002 The UbixOS Project -all: tools kernel libc ubix objgfx40 libcpp bin +all: tools kernel libc ubix objgfx40 libcpp views bin # depend kernel tools libc: src @@ -10,6 +10,9 @@ objgfx40: src (cd src/lib/objgfx40;make) +views: src + (cd src/lib/views/sunlight;make) + ubix: src (cd src/lib/ubix;make) @@ -38,3 +41,4 @@ (cd src/lib/ubix;make clean) (cd src/lib/objgfx40;make clean) (cd src/lib/libcpp;make clean) + (cd src/lib/views/sunlight;make clean) diff --git a/src/Makefile.inc b/src/Makefile.inc index 935fc6c..8a14d34 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -2,8 +2,8 @@ # Global 'Source' Options # allow you to change your default compiler without affecting your other work -CC = gcc -CXX = g++ +CC = gcc295 +CXX = g++295 LD = ld AR = ar REMOVE = rm -rf diff --git a/src/lib/libcpp/include/libcpp.h b/src/lib/libcpp/include/libcpp.h index 4ef070f..596455b 100644 --- a/src/lib/libcpp/include/libcpp.h +++ b/src/lib/libcpp/include/libcpp.h @@ -10,15 +10,4 @@ class __default_alloc_template { }; -template -struct string_char_traits { - typedef charT char_type; - static char_type eos () { return char_type(); } - }; - -struct string_char_traits { - strict char eos () { return 0; } - }; - - #endif diff --git a/src/lib/libcpp/libcpp.cc b/src/lib/libcpp/libcpp.cc index a1e7eb4..52beaa9 100644 --- a/src/lib/libcpp/libcpp.cc +++ b/src/lib/libcpp/libcpp.cc @@ -28,7 +28,6 @@ typedef char c; template class __default_alloc_template<0, 0>; -template class string_char_traits ; /* Don't Touch Mark */ void * operator new[](unsigned size) diff --git a/src/lib/views/sunlight/Makefile b/src/lib/views/sunlight/Makefile index dfec52b..cb0db08 100644 --- a/src/lib/views/sunlight/Makefile +++ b/src/lib/views/sunlight/Makefile @@ -33,4 +33,4 @@ # Clean up the junk clean: - $(REMOVE) $(OBJS) $(BINARY) *.core + $(REMOVE) $(OBJS) $(OUTPUT) *.core