Skip to content

Initial unity build changes #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Neko-Box-Coder wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Initial unity build changes #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2068f48
Adding System2.cpp
Neko-Box-Coder Mar 1, 2026
e31268f
First step of unity build, consolidating all cpp files
Neko-Box-Coder Mar 1, 2026
b534534
Updating CppOverride to be standard compliant
Neko-Box-Coder Mar 7, 2026
9da2622
Moving cpp contents to hpp
Neko-Box-Coder Mar 7, 2026
c2b84d1
Tidying up includes with include-what-you-use
Neko-Box-Coder Mar 7, 2026
21b0f06
Updating libyaml
Neko-Box-Coder Mar 7, 2026
640f454
Including libyaml as part of unity build
Neko-Box-Coder Mar 7, 2026
fe6e47c
Updating default script info
Neko-Box-Coder Mar 7, 2026
3d078eb
Moving things in Include to Src, removing Include
Neko-Box-Coder Mar 8, 2026
8ace5f3
Fixing MSVC object size limit and yaml import macro
Neko-Box-Coder Mar 12, 2026
3a77dc3
Adding the ability to run yaml file directly
Neko-Box-Coder Mar 12, 2026
c03ec0a
Adding documentation for allowing yaml file as input
Neko-Box-Coder Mar 13, 2026
30f353f
Updating TODOs
Neko-Box-Coder Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
builds/
Builds/
Build/
build/
v0.*/
*.bak
*.runcpp2/
Expand All @@ -59,5 +60,5 @@ compile_commands.json

# Generated file
Src/runcpp2/DefaultYAMLs.c
Include/cfgpath.h
Src/cfgpath.h
.aider*
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@
[submodule "DSResult"]
path = External/DSResult
url = https://github.com/Neko-Box-Coder/DSResult.git
[submodule "System2.cpp"]
path = External/System2.cpp
url = https://github.com/Neko-Box-Coder/System2.cpp.git
73 changes: 19 additions & 54 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ set(DS_USE_DEBUG_BREAK ON)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/DSResult")

set(BUILD_TESTING ON)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/libyaml")
# add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/libyaml")
add_library(libyaml INTERFACE)
target_include_directories(libyaml INTERFACE "${CMAKE_CURRENT_LIST_DIR}/External/libyaml/include")
set(BUILD_TESTING OFF)

# NOTE: Just include the file. Can't add subdirectory since it install stuff
Expand All @@ -123,7 +125,7 @@ target_include_directories( string-view-lite INTERFACE

# Copy cfgpath.h
configure_file( "${CMAKE_CURRENT_LIST_DIR}/External/cfgpath/cfgpath.h"
"${CMAKE_CURRENT_LIST_DIR}/Include/cfgpath.h" COPYONLY)
"${CMAKE_CURRENT_LIST_DIR}/Src/cfgpath.h" COPYONLY)

add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/CppOverride")

Expand Down Expand Up @@ -177,49 +179,21 @@ endif()
# runcpp2 library
# =========================================================================

set(RUNCPP2_SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/Profile.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/DependencyInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/DependencyLinkProperty.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/DependencySource.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/GitSource.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/LocalSource.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/FileProperties.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/FlagsOverrideInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/ProfilesCommands.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/ProfilesFlagsOverride.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/ScriptInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/ProfilesProcessPaths.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/FilesTypesInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/StageInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/ProfilesDefines.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/FilesToCopyInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/BuildTypeHelper.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/ProfileHelper.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/CompilingLinking.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/ConfigParsing.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/DefaultYAMLs.c"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/DependenciesHelper.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/ParseUtil.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/PlatformUtil.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/StringUtil.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/runcpp2.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/BuildsManager.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/PipelineSteps.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/IncludeManager.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/LibYAML_Wrapper.cpp")

add_library(runcpp2Lib STATIC ${RUNCPP2_SOURCE_FILES})
set(RUNCPP2_SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/runcpp2.cpp")

# add_library(runcpp2Lib STATIC ${RUNCPP2_SOURCE_FILES})
add_library(runcpp2Lib INTERFACE)

set(RUNCPP2_PRIVATE_LINK_LIBS ssLogger System2 CppOverride dylib)
set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem mpark_variant MacroPowerToys string-view-lite yaml DSResult)
set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem mpark_variant MacroPowerToys string-view-lite libyaml DSResult)
target_include_directories(runcpp2Lib INTERFACE "${CMAKE_CURRENT_LIST_DIR}/Src")
target_link_libraries(runcpp2Lib INTERFACE ${RUNCPP2_PRIVATE_LINK_LIBS})
target_link_libraries(runcpp2Lib INTERFACE ${RUNCPP2_PUBLIC_LINK_LIBS})

target_include_directories(runcpp2Lib PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Include")
target_link_libraries(runcpp2Lib PRIVATE ${RUNCPP2_PRIVATE_LINK_LIBS})
target_link_libraries(runcpp2Lib PUBLIC ${RUNCPP2_PUBLIC_LINK_LIBS})

if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# TODO: Try to change to /Wall
set(RUNCPP2_STANDARD_COMPILE_FLAGS "/utf-8;/W1;/DGHC_WIN_DISABLE_WSTRING_STORAGE_TYPE=1")
set(RUNCPP2_STANDARD_COMPILE_FLAGS "/utf-8;/W1;/DGHC_WIN_DISABLE_WSTRING_STORAGE_TYPE=1;/bigobj")
if (RUNCPP2_WARNINGS_AS_ERRORS)
list(APPEND RUNCPP2_STANDARD_COMPILE_FLAGS "/WX")
endif()
Expand All @@ -233,42 +207,33 @@ else()
#"-Wno-unused-but-set-variable"
"-Wno-unused-parameter"
"-Wno-switch"
"-Wno-gnu-zero-variadic-macro-arguments"
# "-Wno-gnu-zero-variadic-macro-arguments"
"-Wextra"
"-Wpedantic")
if (RUNCPP2_WARNINGS_AS_ERRORS)
list(APPEND RUNCPP2_STANDARD_COMPILE_FLAGS "-Werror")
endif()
endif()

target_compile_options(runcpp2Lib PRIVATE "${RUNCPP2_STANDARD_COMPILE_FLAGS}")
target_compile_options(runcpp2Lib INTERFACE "${RUNCPP2_STANDARD_COMPILE_FLAGS}")

# Define the runcpp2 and default config version macro
target_compile_definitions(runcpp2Lib PUBLIC RUNCPP2_VERSION="${RUNCPP2_PROJECT_VERSION}"
RUNCPP2_CONFIG_VERSION=${RUNCPP2_CONFIG_VERSION})
target_compile_definitions(runcpp2Lib INTERFACE RUNCPP2_VERSION="${RUNCPP2_PROJECT_VERSION}"
RUNCPP2_CONFIG_VERSION=${RUNCPP2_CONFIG_VERSION}
YAML_DECLARE_STATIC=1)

# =========================================================================
# runcpp2 executable
# =========================================================================

add_executable(runcpp2 "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/main.cpp")
target_compile_options(runcpp2 PRIVATE "${RUNCPP2_STANDARD_COMPILE_FLAGS}")
target_link_libraries(runcpp2 PUBLIC runcpp2Lib ssLogger)
target_link_libraries(runcpp2 PUBLIC runcpp2Lib)

# =========================================================================
# runcpp2 library override
# =========================================================================

if(RUNCPP2_BUILD_TESTS)
add_library(runcpp2Override STATIC ${RUNCPP2_SOURCE_FILES})
target_include_directories(runcpp2Override PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Include")
target_link_libraries(runcpp2Override PRIVATE ${RUNCPP2_PRIVATE_LINK_LIBS})
target_link_libraries(runcpp2Override PUBLIC ${RUNCPP2_PUBLIC_LINK_LIBS})
target_compile_options(runcpp2Override PRIVATE "${RUNCPP2_STANDARD_COMPILE_FLAGS}")
target_compile_definitions( runcpp2Override PUBLIC
RUNCPP2_VERSION="${RUNCPP2_PROJECT_VERSION}"
RUNCPP2_CONFIG_VERSION=${RUNCPP2_CONFIG_VERSION}
INTERNAL_RUNCPP2_UNIT_TESTS=1)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Src/Tests")
endif()

Expand Down
Loading