diff --git a/.vscode/launch.json b/.vscode/launch.json index 77d3698..a8f4b07 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "C++ Launch", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/harikoff", + "program": "${workspaceFolder}/b/harikoff", "args": [], "stopAtEntry": false, "cwd": "${workspaceFolder}", @@ -22,7 +22,7 @@ "ignoreFailures": true } ], - "preLaunchTask": "build", + "preLaunchTask": "Build", "miDebuggerPath": "/usr/bin/gdb", "logging": { "trace": true, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f4649d7..95ec58e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -13,18 +13,18 @@ "type": "shell", "command": "${workspaceFolder}/configure", "options": { - "cwd": "${workspaceFolder}/b" + "cwd": "${workspaceFolder}/b" }, "group": { - "kind": "build", - "isDefault": true + "kind": "build", + "isDefault": true }, "problemMatcher": ["$gcc"], "dependsOn": ["Create Build Directory"], "detail": "Runs the configure script to prepare the build environment." }, { - "label": "build", + "label": "Build", "type": "shell", "command": "make", "options": { @@ -35,7 +35,7 @@ "isDefault": true }, "problemMatcher": ["$gcc"], - "dependsOn": "Configure", + "dependsOn": ["Configure"], "detail": "Builds the project using make." }, { diff --git a/Makefile.am b/Makefile.am index 77f0dd3..dcbfd02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ SUBDIRS = corelogic +AM_CPPFLAGS = -I$(srcdir)/corelogic/include + bin_PROGRAMS = harikoff -harikoff_SOURCES = +harikoff_SOURCES = main.cpp harikoff_LDADD = corelogic/libcorelogic.a # List of static miscellaneous files to include in the distribution diff --git a/configure b/configure index 0fd29e7..8fda1e7 100755 --- a/configure +++ b/configure @@ -615,7 +615,7 @@ PACKAGE_STRING='The Harriman-Peikoff Project 0.00' PACKAGE_BUGREPORT='latentprion@gmail.com' PACKAGE_URL='github.com/latentprion/harikoff' -ac_unique_file="corelogic/main.cpp" +ac_unique_file="corelogic/mind.cpp" ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS diff --git a/configure.ac b/configure.ac index 6e366f7..6b9782e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT([The Harriman-Peikoff Project], [0.00], [latentprion@gmail.com], [harikoff], [github.com/latentprion/harikoff]) # Safety checks in case user overwritten --srcdir -AC_CONFIG_SRCDIR(corelogic/main.cpp) +AC_CONFIG_SRCDIR([corelogic/mind.cpp]) # Store the auxiliary build tools (e.g., install-sh, config.sub, config.guess) # in this dir (build-aux) diff --git a/corelogic/Makefile.am b/corelogic/Makefile.am index db9e7e7..39d2fd3 100644 --- a/corelogic/Makefile.am +++ b/corelogic/Makefile.am @@ -1,4 +1,4 @@ AM_CPPFLAGS = -I$(srcdir)/include noinst_LIBRARIES = libcorelogic.a -libcorelogic_a_SOURCES = painfulQuale.cpp mind.cpp main.cpp +libcorelogic_a_SOURCES = painfulQuale.cpp mind.cpp diff --git a/corelogic/include/sensors/interoceptor.h b/corelogic/include/sensors/interoceptor.h index be1db6e..057cb81 100644 --- a/corelogic/include/sensors/interoceptor.h +++ b/corelogic/include/sensors/interoceptor.h @@ -11,7 +11,8 @@ public: ~Interoceptor() = default; public: - uint32_t id, value; + uint32_t id; + uint64_t value; }; class NeutralInteroceptor diff --git a/corelogic/main.cpp b/main.cpp similarity index 100% rename from corelogic/main.cpp rename to main.cpp