diff --git a/Depfile b/Depfile index 37baa1f..b72d9ee 100644 --- a/Depfile +++ b/Depfile @@ -27,7 +27,7 @@ LDFLAGS=-g -m32 -nostdlib -fno-builtin -Tkernel.ld -- obj/main.o: scripts/main.spark - /home/felix/projects/Electronics/build-Electronics-Clang-Debug/bin/spark \ + /home/felix/projects/Electronics/build-Electronics-Desktop-Debug/bin/spark \ scripts/main.spark \ obj/main.ca objcopy -B i386 -I binary -O elf32-i386 \ diff --git a/Makefile b/Makefile index ec722b0..d0a49a8 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ CXX = g++ LD = g++ LEX = flex YACC = bison -TEMPLE = mono temple.exe # File Lists SRCS_AS = asm/dynamic.S asm/intr_common_handler.S asm/multiboot.S asm/start.S @@ -36,75 +35,75 @@ kernel: obj/dynamic.o obj/intr_common_handler.o obj/multiboot.o obj/start.o obj/ # src/console.c obj/console.o: src/console.c include/console.h include/kstdlib.h \ include/varargs.h include/config.h include/malloc.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/console.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/console.c # src/init.c obj/init.o: src/init.c include/kernel.h include/kstdlib.h include/varargs.h \ include/config.h include/malloc.h include/console.h include/interrupts.h \ include/cpustate.h include/pmm.h include/multiboot.h include/vmm.h \ include/timer.h include/serial.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/init.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/init.c # src/interrupts.c obj/interrupts.o: src/interrupts.c include/interrupts.h include/cpustate.h \ include/console.h include/kstdlib.h include/varargs.h include/config.h \ include/malloc.h include/io.h src/intr_stubs.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/interrupts.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/interrupts.c # src/malloc.c obj/malloc.o: src/malloc.c include/config.h include/kernel.h \ include/kstdlib.h include/varargs.h include/malloc.h include/console.h \ include/serial.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/malloc.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/malloc.c # src/pmm.c obj/pmm.o: src/pmm.c include/pmm.h include/multiboot.h include/kernel.h \ include/kstdlib.h include/varargs.h include/config.h include/malloc.h \ include/console.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/pmm.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/pmm.c # src/serial.c obj/serial.o: src/serial.c include/io.h include/serial.h include/kstdlib.h \ include/varargs.h include/config.h include/malloc.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/serial.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/serial.c # src/stdlib.c obj/stdlib.o: src/stdlib.c include/kstdlib.h include/varargs.h \ include/config.h include/malloc.h include/kernel.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/stdlib.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/stdlib.c # src/timer.c obj/timer.o: src/timer.c include/timer.h include/kernel.h \ include/interrupts.h include/cpustate.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/timer.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/timer.c # src/vmm.c obj/vmm.o: src/vmm.c include/config.h include/vmm.h include/pmm.h \ include/multiboot.h include/kstdlib.h include/varargs.h include/malloc.h \ include/console.h include/kernel.h - $(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/vmm.c + $(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/vmm.c # src/cplusplus.cpp obj/cplusplus.o: src/cplusplus.cpp include/kstdlib.h include/varargs.h \ include/config.h include/malloc.h include/console.h include/ker/new.hpp - $(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c src/cplusplus.cpp + $(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c src/cplusplus.cpp # src/cpp-test.cpp obj/cpp-test.o: src/cpp-test.cpp include/console.h include/ker/string.hpp \ include/ker/vector.hpp include/ker/dictionary.hpp include/kernel.h \ include/ker/pair.hpp - $(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c src/cpp-test.cpp + $(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c src/cpp-test.cpp # src/vm.cpp obj/vm.o: src/vm.cpp include/kstdlib.h include/varargs.h include/config.h \ include/malloc.h include/timer.h include/dynamic.h include/console.h \ include/interrupts.h include/cpustate.h src/../csl/cpustatetype.hpp - $(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c src/vm.cpp + $(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c src/vm.cpp # csl/cpustatetype.cpp obj/cpustatetype.o: csl/cpustatetype.cpp csl/cpustatetype.hpp \ include/cpustate.h include/console.h - $(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c csl/cpustatetype.cpp + $(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c csl/cpustatetype.cpp # asm/dynamic.S obj/dynamic.o: asm/dynamic.S @@ -125,7 +124,7 @@ obj/start.o: asm/start.S # Custom Targets obj/main.o: scripts/main.spark - /home/felix/projects/Electronics/build-Electronics-Clang-Debug/bin/spark \ + /home/felix/projects/Electronics/build-Electronics-Desktop-Debug/bin/spark \ scripts/main.spark \ obj/main.ca objcopy -B i386 -I binary -O elf32-i386 \ diff --git a/conductance/Makefile b/conductance/Makefile index e4d46ed..681850f 100644 --- a/conductance/Makefile +++ b/conductance/Makefile @@ -15,7 +15,7 @@ CXX = g++ DEFINES = -DCIRCUIT_OS CFLAGS = -pipe -m32 -g -fPIC -Wall -W $(DEFINES) CXXFLAGS = -pipe -g -Wall -Wextra -fno-stack-protector -fno-use-cxa-atexit -nostdlib -fno-builtin -fno-rtti -fno-exceptions -ffreestanding -m32 -fno-leading-underscore -g -fPIC -std=c++0x -Wall -W $(DEFINES) -INCPATH = -I../../Electronics/Electronics/Conductance -I. -I../../Electronics/Electronics/Tools -I/home/felix/projects/trainOS/include -I/usr/lib/qt/mkspecs/linux-g++ +INCPATH = -I../../Electronics/Electronics/Conductance -I. -I../../Electronics/Electronics/Tools -I../include -I/usr/lib/qt/mkspecs/linux-g++ QMAKE = /usr/lib/qt/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d @@ -33,7 +33,7 @@ MOVE = mv -f TAR = tar -cf COMPRESS = gzip -9f DISTNAME = Conductance1.0.0 -DISTDIR = /data/projects/trainOS/conductance/.tmp/Conductance1.0.0 +DISTDIR = /home/felix/projects/trainOS/conductance/.tmp/Conductance1.0.0 AR = ar cqs RANLIB = SED = sed @@ -75,6 +75,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/common/g++-unix.conf \ /usr/lib/qt/mkspecs/qconfig.pri \ /usr/lib/qt/mkspecs/modules/qt_Attica.pri \ + /usr/lib/qt/mkspecs/modules/qt_BluezQt.pri \ /usr/lib/qt/mkspecs/modules/qt_KActivities.pri \ /usr/lib/qt/mkspecs/modules/qt_KArchive.pri \ /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ @@ -110,6 +111,8 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri \ /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ @@ -132,8 +135,14 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_help_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_location.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimedia_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ @@ -148,6 +157,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ @@ -170,8 +180,16 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_uiplugin.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_uitools.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webengine_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginecore.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginecore_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \ @@ -275,6 +293,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/common/g++-unix.conf \ /usr/lib/qt/mkspecs/qconfig.pri \ /usr/lib/qt/mkspecs/modules/qt_Attica.pri \ + /usr/lib/qt/mkspecs/modules/qt_BluezQt.pri \ /usr/lib/qt/mkspecs/modules/qt_KActivities.pri \ /usr/lib/qt/mkspecs/modules/qt_KArchive.pri \ /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ @@ -310,6 +329,8 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri \ /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ @@ -332,8 +353,14 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_lib_help_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_location.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimedia_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ @@ -348,6 +375,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ @@ -370,8 +398,16 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_lib_uiplugin.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_uitools.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webengine_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginecore.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginecore_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \ @@ -420,6 +456,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/common/g++-unix.conf: /usr/lib/qt/mkspecs/qconfig.pri: /usr/lib/qt/mkspecs/modules/qt_Attica.pri: +/usr/lib/qt/mkspecs/modules/qt_BluezQt.pri: /usr/lib/qt/mkspecs/modules/qt_KActivities.pri: /usr/lib/qt/mkspecs/modules/qt_KArchive.pri: /usr/lib/qt/mkspecs/modules/qt_KAuth.pri: @@ -455,6 +492,8 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri: /usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri: /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri: @@ -477,8 +516,14 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_lib_help_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_location.pri: /usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_multimedia.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_multimedia_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_network.pri: /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri: /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri: @@ -493,6 +538,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri: @@ -515,8 +561,16 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/ /usr/lib/qt/mkspecs/modules/qt_lib_uiplugin.pri: /usr/lib/qt/mkspecs/modules/qt_lib_uitools.pri: /usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webengine_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri: @@ -595,71 +649,88 @@ compiler_clean: ####### Compile compoundtype.o: ../../Electronics/Electronics/Conductance/types/compoundtype.cpp ../../Electronics/Electronics/Conductance/types/compoundtype.hpp \ - /home/felix/projects/trainOS/include/ker/dictionary.hpp \ - /home/felix/projects/trainOS/include/kernel.h \ - /home/felix/projects/trainOS/include/ker/pair.hpp \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ - /home/felix/projects/trainOS/include/ker/new.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../include/ker/vector.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ + ../include/ker/new.hpp \ ../../Electronics/Electronics/Conductance/vmtype.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ - ../../Electronics/Electronics/Conductance/vmvalue.hpp + ../include/ker/string.hpp \ + ../../Electronics/Electronics/Conductance/vmvalue.hpp \ + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../../Electronics/Electronics/Tools/fixedstring.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o compoundtype.o ../../Electronics/Electronics/Conductance/types/compoundtype.cpp vmpointertype.o: ../../Electronics/Electronics/Conductance/types/vmpointertype.cpp ../../Electronics/Electronics/Conductance/types/vmpointertype.hpp \ ../../Electronics/Electronics/Conductance/vmtype.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/ker/new.hpp \ - ../../Electronics/Electronics/Conductance/vmvalue.hpp + ../include/ker/string.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ + ../include/ker/vector.hpp \ + ../include/ker/new.hpp \ + ../../Electronics/Electronics/Conductance/vmvalue.hpp \ + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../../Electronics/Electronics/Tools/fixedstring.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmpointertype.o ../../Electronics/Electronics/Conductance/types/vmpointertype.cpp vmprimitivetype.o: ../../Electronics/Electronics/Conductance/types/vmprimitivetype.cpp ../../Electronics/Electronics/Conductance/types/vmprimitivetype.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ + ../include/ker/string.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ ../../Electronics/Electronics/Conductance/vmtype.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/ker/new.hpp \ - ../../Electronics/Electronics/Conductance/vmvalue.hpp + ../include/ker/vector.hpp \ + ../include/ker/new.hpp \ + ../../Electronics/Electronics/Conductance/vmvalue.hpp \ + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../../Electronics/Electronics/Tools/fixedstring.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmprimitivetype.o ../../Electronics/Electronics/Conductance/types/vmprimitivetype.cpp vmvoidtype.o: ../../Electronics/Electronics/Conductance/types/vmvoidtype.cpp ../../Electronics/Electronics/Conductance/types/vmvoidtype.hpp \ ../../Electronics/Electronics/Conductance/vmtype.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/ker/new.hpp \ - ../../Electronics/Electronics/Conductance/vmvalue.hpp + ../include/ker/string.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ + ../include/ker/vector.hpp \ + ../include/ker/new.hpp \ + ../../Electronics/Electronics/Conductance/vmvalue.hpp \ + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../../Electronics/Electronics/Tools/fixedstring.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmvoidtype.o ../../Electronics/Electronics/Conductance/types/vmvoidtype.cpp assembly.o: ../../Electronics/Electronics/Conductance/assembly.cpp ../../Electronics/Electronics/Conductance/assembly.hpp \ - /home/felix/projects/trainOS/include/ker/dictionary.hpp \ - /home/felix/projects/trainOS/include/kernel.h \ - /home/felix/projects/trainOS/include/ker/pair.hpp \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ - /home/felix/projects/trainOS/include/ker/new.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../include/ker/vector.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ + ../include/ker/new.hpp \ + ../include/ker/string.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ ../../Electronics/Electronics/Tools/refcounted.hpp \ ../../Electronics/Electronics/Tools/fixedstring.hpp \ @@ -668,35 +739,35 @@ assembly.o: ../../Electronics/Electronics/Conductance/assembly.cpp ../../Electro $(CXX) -c $(CXXFLAGS) $(INCPATH) -o assembly.o ../../Electronics/Electronics/Conductance/assembly.cpp opcodes.o: ../../Electronics/Electronics/Conductance/opcodes.cpp ../../Electronics/Electronics/Conductance/opcodes.hpp \ - /home/felix/projects/trainOS/include/ker/dictionary.hpp \ - /home/felix/projects/trainOS/include/kernel.h \ - /home/felix/projects/trainOS/include/ker/pair.hpp \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ - /home/felix/projects/trainOS/include/ker/new.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../include/ker/vector.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ + ../include/ker/new.hpp \ + ../include/ker/string.hpp \ ../../Electronics/Electronics/Tools/fixedstring.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o opcodes.o ../../Electronics/Electronics/Conductance/opcodes.cpp -virtualmachine.o: ../../Electronics/Electronics/Conductance/virtualmachine.cpp /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ +virtualmachine.o: ../../Electronics/Electronics/Conductance/virtualmachine.cpp ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ ../../Electronics/Electronics/Conductance/vmtype.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/ker/new.hpp \ + ../include/ker/string.hpp \ + ../include/ker/vector.hpp \ + ../include/ker/new.hpp \ ../../Electronics/Electronics/Conductance/vmvalue.hpp \ - ../../Electronics/Electronics/Conductance/virtualmachine.hpp \ ../../Electronics/Electronics/Conductance/opcodes.hpp \ - /home/felix/projects/trainOS/include/ker/dictionary.hpp \ - /home/felix/projects/trainOS/include/kernel.h \ - /home/felix/projects/trainOS/include/ker/pair.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ ../../Electronics/Electronics/Tools/fixedstring.hpp \ + ../../Electronics/Electronics/Conductance/virtualmachine.hpp \ ../../Electronics/Electronics/Tools/binaryreader.hpp \ ../../Electronics/Electronics/Tools/refcounted.hpp \ ../../Electronics/Electronics/Conductance/assembly.hpp \ @@ -705,35 +776,45 @@ virtualmachine.o: ../../Electronics/Electronics/Conductance/virtualmachine.cpp / vmtype.o: ../../Electronics/Electronics/Conductance/vmtype.cpp ../../Electronics/Electronics/Conductance/vmtype.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/ker/new.hpp \ + ../include/ker/string.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ + ../include/ker/vector.hpp \ + ../include/ker/new.hpp \ ../../Electronics/Electronics/Conductance/vmvalue.hpp \ + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../../Electronics/Electronics/Tools/fixedstring.hpp \ ../../Electronics/Electronics/Conductance/types/vmvoidtype.hpp \ ../../Electronics/Electronics/Conductance/types/vmprimitivetype.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmtype.o ../../Electronics/Electronics/Conductance/vmtype.cpp vmvalue.o: ../../Electronics/Electronics/Conductance/vmvalue.cpp ../../Electronics/Electronics/Conductance/vmvalue.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ - /home/felix/projects/trainOS/include/ker/string.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h \ - /home/felix/projects/trainOS/include/ker/vector.hpp \ - /home/felix/projects/trainOS/include/ker/new.hpp \ - ../../Electronics/Electronics/Conductance/vmtype.hpp + ../include/ker/string.hpp \ + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h \ + ../include/ker/vector.hpp \ + ../include/ker/new.hpp \ + ../../Electronics/Electronics/Conductance/vmtype.hpp \ + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../../Electronics/Electronics/Tools/fixedstring.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmvalue.o ../../Electronics/Electronics/Conductance/vmvalue.cpp string.o: ../ker/string.cpp ../include/ker/string.hpp \ - /home/felix/projects/trainOS/include/kstdlib.h \ - /home/felix/projects/trainOS/include/varargs.h \ - /home/felix/projects/trainOS/include/config.h \ - /home/felix/projects/trainOS/include/malloc.h + ../include/kstdlib.h \ + ../include/varargs.h \ + ../include/config.h \ + ../include/malloc.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o string.o ../ker/string.cpp ####### Install