diff --git a/UbixOS-Team b/UbixOS-Team index 70cf3ea..b5b62c5 100755 --- a/UbixOS-Team +++ b/UbixOS-Team @@ -1,10 +1,10 @@ $Id$ -Christopher Olsen AKA Ubu Project Founder colsen@ubixos.com -Larry Sica AKA lomion Project Dictator lsica@ubixos.com -Mark Iuzzolino AKA TCA Lead Gui Developer miuzzolino@ubixos.com -Frank Laszlo AKA nez Lead Slacker flaszlo@ubixos.com +Christopher Olsen AKA Ubu Project Founder +Larry Sica AKA lomion Project Dictator +Mark Iuzzolino AKA TCA Lead Gui Developer +Frank Laszlo AKA nez Lead Slacker Johnny Zackrisson AKA Hypno James Johnson AKA jimj Jeff Leveille AKA grayspace diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 5594c03..03acc4e 100755 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -8,7 +8,6 @@ #include #include #include - int main(); descriptorTable(gdt,4) { diff --git a/ubixos.kdevprj b/ubixos.kdevprj index fc3e5a1..c373a87 100755 --- a/ubixos.kdevprj +++ b/ubixos.kdevprj @@ -1,241 +1,110 @@ +# KDE Config File +[Makefile] +install_location= +dist=true +install=false +type=DATA +[src/lib/Makefile.am] +sub_dirs=libc, +type=normal +[src/sys/include/copyright/copyright.h] +install_location= +dist=true +install=false +type=HEADER +[Config for BinMakefileAm] +ldflags= +addcxxflags= +ldadd= +bin_program=ubixos +cxxflags= +[./ubixos.kdevprj] +install_location= +dist=true +install=false +type=DATA +[src/sys/boot/boot.s] +install_location= +dist=true +install=false +type=SOURCE +[LFV Groups] +GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, +Others=*, +Translations=*.ts,*.po, +groups=Headers,Sources,GNU,Translations,User Interface,Others +Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, +User Interface=*.ui,*.kdevdlg,*.rc, +Headers=*.h,*.hxx,*.hpp,*.H, +[src/sys/include/copyright/Makefile.am] +files=src/sys/include/copyright/copyright.h, +sub_dirs= +type=normal [./Makefile.am] files=./UbixOS-Team,./ubixos.kdevprj, sub_dirs=src, type=normal - -[./UbixOS-Team] -dist=true -install=false -install_location= -type=DATA - -[./ubixos.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=ubixos -cxxflags=\s-O1 -ldadd= -ldflags= -libtool_dir= -path_to_bin_program=. - -[General] -AMChanged=false -author=Christopher Olsen -dir_where_make_will_be_called=./ -email=Chris@DomainAtlantic.com -kdevprj_version=1.3 -lfv_open_groups=Others -make_options=\s-j1 clean all -makefiles=./Makefile.am,src/Makefile.am,src/sys/Makefile.am,src/sys/include/Makefile.am,src/lib/Makefile.am,src/lib/libc/Makefile.am,src/lib/libc/include/Makefile.am,src/bin/Makefile.am,src/bin/shell/Makefile.am,Makefile.am,src/sys/boot/Makefile.am,src/sys/init/Makefile.am,src/sys/include/ubixos/Makefile.am,src/sys/drivers/Makefile.am,src/sys/kernel/Makefile.am,src/sys/compile/Makefile.am,src/sys/include/version/Makefile.am,src/sys/include/drivers/Makefile.am -modifyMakefiles=true -project_name=UbixOS -project_type=normal_empty -short_info= -sub_dir= -version=0.01 -version_control=CVS -workspace=1 - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Headers=*.h,*.hxx,*.hpp,*.H, -Others=*, -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -Translations=*.ts,*.po, -User Interface=*.ui,*.kdevdlg,*.rc, -groups=Headers,Sources,GNU,Translations,User Interface,Others - -[Makefile] -dist=true -install=false -install_location= -type=DATA - -[Makefile.am] -files=UbixOS-Team,Makefile -sub_dirs=src +[src/bin/Makefile.am] +sub_dirs=shell, type=normal - -[UbixOS-Team] +[src/lib/libc/Makefile.am] +sub_dirs=include, +type=normal +[src/lib/libc/include/Makefile.am] +sub_dirs= +type=normal +[./UbixOS-Team] +install_location= dist=true install=false -install_location= type=DATA - +[src/sys/Makefile] +install_location= +dist=true +install=false +type=DATA [src/Makefile.am] files= sub_dirs=sys,lib,bin, type=normal - -[src/bin/Makefile.am] -sub_dirs=shell, -type=normal - [src/bin/shell/Makefile.am] sub_dirs= type=normal - -[src/lib/Makefile.am] -sub_dirs=libc, +[General] +makefiles=./Makefile.am,src/Makefile.am,src/sys/Makefile.am,src/sys/include/Makefile.am,src/lib/Makefile.am,src/lib/libc/Makefile.am,src/lib/libc/include/Makefile.am,src/bin/Makefile.am,src/bin/shell/Makefile.am,Makefile.am,src/sys/boot/Makefile.am,src/sys/include/copyright/Makefile.am, +version_control=CVS +author=reddawg +project_type=normal_empty +sub_dir= +lfv_open_groups=Others +workspace=1 +project_name=ubixos +version= +AMChanged=false +email=reddawg@Laptop.DomainAtlantic.Net +kdevprj_version=1.3 +[src/sys/include/Makefile.am] +sub_dirs=copyright, type=normal - -[src/lib/libc/Makefile.am] -sub_dirs=include, +[Makefile.am] +files=UbixOS-Team,Makefile +sub_dirs=src type=normal - -[src/lib/libc/include/Makefile.am] -sub_dirs= -type=normal - -[src/sys/Makefile] -dist=true -install=false -install_location= -type=DATA - [src/sys/Makefile.am] files=src/sys/Makefile -sub_dirs=include,boot,init,drivers,kernel,compile +sub_dirs=include,boot type=normal - -[src/sys/boot/Makefile] -dist=true -install=false -install_location= -type=DATA - [src/sys/boot/Makefile.am] -files=src/sys/boot/Makefile,src/sys/boot/bootsec.asm +files=src/sys/boot/boot.s,src/sys/boot/Makefile sub_dirs= type=normal - -[src/sys/boot/bootsec.asm] +[UbixOS-Team] +install_location= dist=true install=false -install_location= type=DATA - -[src/sys/compile/Makefile] +[src/sys/boot/Makefile] +install_location= dist=true install=false -install_location= type=DATA - -[src/sys/compile/Makefile.am] -files=src/sys/compile/Makefile -sub_dirs= -type=normal - -[src/sys/drivers/Makefile] -dist=true -install=false -install_location= -type=DATA - -[src/sys/drivers/Makefile.am] -files=src/sys/drivers/Makefile,src/sys/drivers/video.c -sub_dirs= -type=static_library - -[src/sys/drivers/video.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/sys/include/Makefile.am] -sub_dirs=ubixos,version,drivers -type=normal - -[src/sys/include/drivers/Makefile.am] -files=src/sys/include/drivers/video.h -sub_dirs= -type=normal - -[src/sys/include/drivers/video.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/ubixos/Makefile.am] -files=src/sys/include/ubixos/gdt.h,src/sys/include/ubixos/scheduler.h,src/sys/include/ubixos/io.h -sub_dirs= -type=normal - -[src/sys/include/ubixos/gdt.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/ubixos/io.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/ubixos/scheduler.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/include/version/Makefile.am] -files=src/sys/include/version/version.h -sub_dirs= -type=normal - -[src/sys/include/version/version.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/init/Makefile] -dist=true -install=false -install_location= -type=DATA - -[src/sys/init/Makefile.am] -files=src/sys/init/main.c,src/sys/init/Makefile -sharedlib_LDFLAGS=-version-info 0:0:1 -sharedlib_rootname=init -sub_dirs= -type=static_library - -[src/sys/init/main.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/sys/kernel/Makefile] -dist=true -install=false -install_location= -type=DATA - -[src/sys/kernel/Makefile.am] -files=src/sys/kernel/Makefile,src/sys/kernel/io.c,src/sys/kernel/version.c -sub_dirs= -type=static_library - -[src/sys/kernel/io.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/sys/kernel/version.c] -dist=true -install=false -install_location= -type=SOURCE