From 166399f143f79c8d68d8931fb96c43c45ebc55d4 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 4 Oct 2025 13:34:31 -0600 Subject: [PATCH] Move main source files into src/ --- CMakeLists.txt | 21 ++++++++++--------- dll/kernel32/wow64apiset.cpp | 2 +- dll/msvcrt.cpp | 2 +- dll/ntdll.cpp | 2 +- access.cpp => src/access.cpp | 0 access.h => src/access.h | 0 common.h => src/common.h | 0 errors.cpp => src/errors.cpp | 0 errors.h => src/errors.h | 0 files.cpp => src/files.cpp | 0 files.h => src/files.h | 2 +- handles.cpp => src/handles.cpp | 0 handles.h => src/handles.h | 0 loader.cpp => src/loader.cpp | 0 main.cpp => src/main.cpp | 0 .../module_registry.cpp | 0 processes.cpp => src/processes.cpp | 2 +- processes.h => src/processes.h | 2 +- resources.cpp => src/resources.cpp | 0 resources.h => src/resources.h | 0 strutil.cpp => src/strutil.cpp | 0 strutil.h => src/strutil.h | 0 22 files changed, 17 insertions(+), 16 deletions(-) rename access.cpp => src/access.cpp (100%) rename access.h => src/access.h (100%) rename common.h => src/common.h (100%) rename errors.cpp => src/errors.cpp (100%) rename errors.h => src/errors.h (100%) rename files.cpp => src/files.cpp (100%) rename files.h => src/files.h (97%) rename handles.cpp => src/handles.cpp (100%) rename handles.h => src/handles.h (100%) rename loader.cpp => src/loader.cpp (100%) rename main.cpp => src/main.cpp (100%) rename module_registry.cpp => src/module_registry.cpp (100%) rename processes.cpp => src/processes.cpp (99%) rename processes.h => src/processes.h (96%) rename resources.cpp => src/resources.cpp (100%) rename resources.h => src/resources.h (100%) rename strutil.cpp => src/strutil.cpp (100%) rename strutil.h => src/strutil.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11b9d45..21e8fdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,17 +73,18 @@ add_executable(wibo dll/user32.cpp dll/vcruntime.cpp dll/version.cpp - access.cpp - errors.cpp - files.cpp - handles.cpp - loader.cpp - resources.cpp - module_registry.cpp - main.cpp - processes.cpp - strutil.cpp + src/access.cpp + src/errors.cpp + src/files.cpp + src/handles.cpp + src/loader.cpp + src/resources.cpp + src/module_registry.cpp + src/main.cpp + src/processes.cpp + src/strutil.cpp ) +target_include_directories(wibo PRIVATE dll src) target_link_libraries(wibo PRIVATE std::filesystem mimalloc-static) install(TARGETS wibo DESTINATION bin) diff --git a/dll/kernel32/wow64apiset.cpp b/dll/kernel32/wow64apiset.cpp index cf9d373..ffaa3f1 100644 --- a/dll/kernel32/wow64apiset.cpp +++ b/dll/kernel32/wow64apiset.cpp @@ -1,6 +1,6 @@ #include "wow64apiset.h" #include "common.h" -#include "dll/kernel32/internal.h" +#include "kernel32/internal.h" #include "errors.h" #include "handles.h" diff --git a/dll/msvcrt.cpp b/dll/msvcrt.cpp index e95ccc0..f99d4d4 100644 --- a/dll/msvcrt.cpp +++ b/dll/msvcrt.cpp @@ -1,5 +1,5 @@ #include "common.h" -#include "dll/kernel32/internal.h" +#include "kernel32/internal.h" #include #include #include diff --git a/dll/ntdll.cpp b/dll/ntdll.cpp index 27679ab..b71dbaa 100644 --- a/dll/ntdll.cpp +++ b/dll/ntdll.cpp @@ -1,5 +1,5 @@ #include "common.h" -#include "dll/kernel32/internal.h" +#include "kernel32/internal.h" #include "errors.h" #include "files.h" #include "handles.h" diff --git a/access.cpp b/src/access.cpp similarity index 100% rename from access.cpp rename to src/access.cpp diff --git a/access.h b/src/access.h similarity index 100% rename from access.h rename to src/access.h diff --git a/common.h b/src/common.h similarity index 100% rename from common.h rename to src/common.h diff --git a/errors.cpp b/src/errors.cpp similarity index 100% rename from errors.cpp rename to src/errors.cpp diff --git a/errors.h b/src/errors.h similarity index 100% rename from errors.h rename to src/errors.h diff --git a/files.cpp b/src/files.cpp similarity index 100% rename from files.cpp rename to src/files.cpp diff --git a/files.h b/src/files.h similarity index 97% rename from files.h rename to src/files.h index c265e70..efe195b 100644 --- a/files.h +++ b/src/files.h @@ -1,7 +1,7 @@ #pragma once #include "common.h" -#include "dll/kernel32/internal.h" +#include "kernel32/internal.h" #include #include diff --git a/handles.cpp b/src/handles.cpp similarity index 100% rename from handles.cpp rename to src/handles.cpp diff --git a/handles.h b/src/handles.h similarity index 100% rename from handles.h rename to src/handles.h diff --git a/loader.cpp b/src/loader.cpp similarity index 100% rename from loader.cpp rename to src/loader.cpp diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/module_registry.cpp b/src/module_registry.cpp similarity index 100% rename from module_registry.cpp rename to src/module_registry.cpp diff --git a/processes.cpp b/src/processes.cpp similarity index 99% rename from processes.cpp rename to src/processes.cpp index 1dd7c45..49560b1 100644 --- a/processes.cpp +++ b/src/processes.cpp @@ -1,6 +1,6 @@ #include "processes.h" #include "common.h" -#include "dll/kernel32/internal.h" +#include "kernel32/internal.h" #include "files.h" #include "handles.h" #include diff --git a/processes.h b/src/processes.h similarity index 96% rename from processes.h rename to src/processes.h index be195f6..8ced5dd 100644 --- a/processes.h +++ b/src/processes.h @@ -1,6 +1,6 @@ #pragma once -#include "dll/kernel32/internal.h" +#include "kernel32/internal.h" #include #include diff --git a/resources.cpp b/src/resources.cpp similarity index 100% rename from resources.cpp rename to src/resources.cpp diff --git a/resources.h b/src/resources.h similarity index 100% rename from resources.h rename to src/resources.h diff --git a/strutil.cpp b/src/strutil.cpp similarity index 100% rename from strutil.cpp rename to src/strutil.cpp diff --git a/strutil.h b/src/strutil.h similarity index 100% rename from strutil.h rename to src/strutil.h