Skip to content
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.

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

Preview only PR #409

Merged
merged 93 commits into from
Nov 9, 2024
Merged

Preview only PR #409

merged 93 commits into from
Nov 9, 2024

Conversation

GlynLeine
Copy link
Member

PR only for @LeonBrands to see my changes on the CMake

@GlynLeine GlynLeine marked this pull request as draft December 27, 2022 19:03
Copy link
Collaborator

@LeonBrands LeonBrands left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple comments, I didn't review any of the C++ code, only the cmake work

CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
VisualStudio22-All.bat Outdated Show resolved Hide resolved
@@ -1,11 +1,19 @@
# Sandbox depends on applications and graphics in this case

if (${RYTHE_MODULE_APPLICATION} AND ${RYTHE_MODULE_GRAPHICS})
if (${RYTHE_BUILD_APPLICATIONS} AND ${RYTHE_MODULE_GRAPHICS})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems incorrect, I think you confused what this if statement was for - When this was written, sandbox depended on the Application module, RYTHE_BUILD_APPLICATIONS isn't that. If sandbox still depends on the application module, we should be checking if it's enabled.

You shouldn't have to check for RYTHE_BUILD_APPLICATIONS here, applications aren't enabled at all if RYTHE_BUILD_APPLICATIONS is disabled, meaning this code wouldn't run in the first place

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could be interesting to explore a more explicit & generalized dependency system for applications, maybe they could report their dependencies and then the applications cmake could check if they can be run

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No the reason this happened was because i was testing rendering without the application module. it's temporary and it should be:
if (${RYTHE_BUILD_APPLICATIONS} AND ${RYTHE_MODULE_APPLICATION} AND ${RYTHE_MODULE_GRAPHICS})

@@ -35,7 +35,14 @@ macro(rythe_add_third_party)

foreach(target ${RYTHE_ADD_THIRD_PARTY_FOLDER_TARGETS})
if (TARGET ${target})
set_target_properties(${target} PROPERTIES FOLDER ${RYTHE_ADD_THIRD_PARTY_FOLDER})
string(REGEX REPLACE "^third_party" "4 - third party" filter ${RYTHE_ADD_THIRD_PARTY_FOLDER})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a quick fix/hack or the only way of doing this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only way i could find..

GlynLeine and others added 28 commits December 14, 2023 23:53
…additional_include_dirs, include "include" folder as well for third party libraries
…clean refresh project to fix "project up to date", update premake
# Conflicts:
#	applications/sandbox/assets/textures/warlock/retopo_and_uv_warlock_5_Warlock_AO.tif
#	applications/sandbox/engine/resources/rythe/icon
#	applications/sandbox/engine/tools/lgnspre/VCRUNTIME140.dll
#	applications/sandbox/engine/tools/lgnspre/_asyncio.pyd
#	applications/sandbox/engine/tools/lgnspre/_bz2.pyd
#	applications/sandbox/engine/tools/lgnspre/_ctypes.pyd
#	applications/sandbox/engine/tools/lgnspre/_decimal.pyd
#	applications/sandbox/engine/tools/lgnspre/_elementtree.pyd
#	applications/sandbox/engine/tools/lgnspre/_hashlib.pyd
#	applications/sandbox/engine/tools/lgnspre/_lzma.pyd
#	applications/sandbox/engine/tools/lgnspre/_multiprocessing.pyd
#	applications/sandbox/engine/tools/lgnspre/_overlapped.pyd
#	applications/sandbox/engine/tools/lgnspre/_queue.pyd
#	applications/sandbox/engine/tools/lgnspre/_socket.pyd
#	applications/sandbox/engine/tools/lgnspre/_ssl.pyd
#	applications/sandbox/engine/tools/lgnspre/_testcapi.pyd
#	applications/sandbox/engine/tools/lgnspre/_tkinter.pyd
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-console-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-datetime-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-debug-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-errorhandling-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l1-2-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-file-l2-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-handle-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-heap-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-interlocked-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-libraryloader-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-localization-l1-2-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-memory-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-namedpipe-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processenvironment-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-processthreads-l1-1-1.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-profile-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-rtlsupport-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-string-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-synch-l1-2-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-sysinfo-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-timezone-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-core-util-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-conio-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-convert-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-environment-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-filesystem-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-heap-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-locale-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-math-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-process-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-runtime-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-stdio-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-string-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-time-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/api-ms-win-crt-utility-l1-1-0.dll
#	applications/sandbox/engine/tools/lgnspre/base_library.zip
#	applications/sandbox/engine/tools/lgnspre/libcrypto-1_1-x64.dll
#	applications/sandbox/engine/tools/lgnspre/libffi-7.dll
#	applications/sandbox/engine/tools/lgnspre/libssl-1_1-x64.dll
#	applications/sandbox/engine/tools/lgnspre/pyexpat.pyd
#	applications/sandbox/engine/tools/lgnspre/python38.dll
#	applications/sandbox/engine/tools/lgnspre/pywintypes38.dll
#	applications/sandbox/engine/tools/lgnspre/select.pyd
#	applications/sandbox/engine/tools/lgnspre/tcl86t.dll
#	applications/sandbox/engine/tools/lgnspre/tk86t.dll
#	applications/sandbox/engine/tools/lgnspre/ucrtbase.dll
#	applications/sandbox/engine/tools/lgnspre/unicodedata.pyd
#	applications/sandbox/engine/tools/lgnspre/win32api.pyd
#	applications/sandbox/engine/tools/lgnspre/win32evtlog.pyd
…l, warnings as errors, more flexible src dirs, floating point config, windows icons, vector extensions, documentation of project structure definition
@GlynLeine GlynLeine merged commit 9248a15 into develop/current Nov 9, 2024
2 of 30 checks passed
@GlynLeine GlynLeine deleted the develop/core-3 branch November 9, 2024 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants