Refactor project structure and update configurations

The project now builds.

- Updated .vscode/launch.json and .vscode/tasks.json for improved
    development workflow
- Modified Makefile.am, configure, and configure.ac for build process
    enhancements
- Updated corelogic/Makefile.am and
    corelogic/include/sensors/interoceptor.h
- Renamed corelogic/main.cpp to main.cpp for better project organization
This commit is contained in:
2024-11-22 20:07:42 +11:00
parent c2a677502e
commit 6dc4287ae3
8 changed files with 15 additions and 12 deletions
+2 -2
View File
@@ -8,7 +8,7 @@
"name": "C++ Launch", "name": "C++ Launch",
"type": "cppdbg", "type": "cppdbg",
"request": "launch", "request": "launch",
"program": "${workspaceFolder}/harikoff", "program": "${workspaceFolder}/b/harikoff",
"args": [], "args": [],
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
@@ -22,7 +22,7 @@
"ignoreFailures": true "ignoreFailures": true
} }
], ],
"preLaunchTask": "build", "preLaunchTask": "Build",
"miDebuggerPath": "/usr/bin/gdb", "miDebuggerPath": "/usr/bin/gdb",
"logging": { "logging": {
"trace": true, "trace": true,
+5 -5
View File
@@ -13,18 +13,18 @@
"type": "shell", "type": "shell",
"command": "${workspaceFolder}/configure", "command": "${workspaceFolder}/configure",
"options": { "options": {
"cwd": "${workspaceFolder}/b" "cwd": "${workspaceFolder}/b"
}, },
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
}, },
"problemMatcher": ["$gcc"], "problemMatcher": ["$gcc"],
"dependsOn": ["Create Build Directory"], "dependsOn": ["Create Build Directory"],
"detail": "Runs the configure script to prepare the build environment." "detail": "Runs the configure script to prepare the build environment."
}, },
{ {
"label": "build", "label": "Build",
"type": "shell", "type": "shell",
"command": "make", "command": "make",
"options": { "options": {
@@ -35,7 +35,7 @@
"isDefault": true "isDefault": true
}, },
"problemMatcher": ["$gcc"], "problemMatcher": ["$gcc"],
"dependsOn": "Configure", "dependsOn": ["Configure"],
"detail": "Builds the project using make." "detail": "Builds the project using make."
}, },
{ {
+3 -1
View File
@@ -1,7 +1,9 @@
SUBDIRS = corelogic SUBDIRS = corelogic
AM_CPPFLAGS = -I$(srcdir)/corelogic/include
bin_PROGRAMS = harikoff bin_PROGRAMS = harikoff
harikoff_SOURCES = harikoff_SOURCES = main.cpp
harikoff_LDADD = corelogic/libcorelogic.a harikoff_LDADD = corelogic/libcorelogic.a
# List of static miscellaneous files to include in the distribution # List of static miscellaneous files to include in the distribution
Vendored
+1 -1
View File
@@ -615,7 +615,7 @@ PACKAGE_STRING='The Harriman-Peikoff Project 0.00'
PACKAGE_BUGREPORT='latentprion@gmail.com' PACKAGE_BUGREPORT='latentprion@gmail.com'
PACKAGE_URL='github.com/latentprion/harikoff' PACKAGE_URL='github.com/latentprion/harikoff'
ac_unique_file="corelogic/main.cpp" ac_unique_file="corelogic/mind.cpp"
ac_subst_vars='am__EXEEXT_FALSE ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
LTLIBOBJS LTLIBOBJS
+1 -1
View File
@@ -2,7 +2,7 @@ AC_INIT([The Harriman-Peikoff Project], [0.00], [latentprion@gmail.com],
[harikoff], [github.com/latentprion/harikoff]) [harikoff], [github.com/latentprion/harikoff])
# Safety checks in case user overwritten --srcdir # 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) # Store the auxiliary build tools (e.g., install-sh, config.sub, config.guess)
# in this dir (build-aux) # in this dir (build-aux)
+1 -1
View File
@@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS = -I$(srcdir)/include
noinst_LIBRARIES = libcorelogic.a noinst_LIBRARIES = libcorelogic.a
libcorelogic_a_SOURCES = painfulQuale.cpp mind.cpp main.cpp libcorelogic_a_SOURCES = painfulQuale.cpp mind.cpp
+2 -1
View File
@@ -11,7 +11,8 @@ public:
~Interoceptor() = default; ~Interoceptor() = default;
public: public:
uint32_t id, value; uint32_t id;
uint64_t value;
}; };
class NeutralInteroceptor class NeutralInteroceptor
View File