Commit graph

71 commits

Author SHA1 Message Date
marauder2k7 acf3177021 Revert "example cmake workflow"
This reverts commit 233c6a8045.
2023-10-21 07:08:12 +01:00
marauder2k7 233c6a8045 example cmake workflow 2023-10-21 01:50:31 +01:00
marauder2k7 8b7e318fd5 multiplatform fixes
-Wrap macosconfig in if(apple)
2023-10-20 22:33:20 +01:00
marauder2k7 f10520e751 Macosx build with rpath
Archiving builds no longer have linking errors when run
2023-10-20 21:06:53 +01:00
marauder2k7 b6617b1b0f Working multi-arch archiving
-Working multi arch compile
-Required assets now copy to the app bundle
TODO: Make the logic to wrap around whether its multi arch
-The changes in torqumacosconfigs.cmake are not required if we are only building one architecture, also if it is x86_64 we can drop min deployment target to 10.13
2023-10-20 12:04:56 +01:00
marauder2k7 e381bf4838 Working archive
-Archive now working if we override the shared libs rpath with the correct installation path
2023-10-20 00:19:40 +01:00
marauder2k7 0af0b5a24a MACOS working
Mac working in this stage
2023-10-19 14:39:22 +01:00
marauder2k7 c11587cad3 Attempt 2
-Missing includes may be due to no parent_scope
2023-10-19 11:04:16 +01:00
AzaezelX 3bdce1f33e lower engine requirements back to c++17 standards, not c++20. 2023-10-15 16:09:49 -05:00
AzaezelX b278802645 cmake cleanups
new global defines: TORQUE_LIB_ROOT_DIRECTORY and TORQUE_LIB_TARG_DIRECTORY for source location and target to build static libs, respectively
reassign location back to torqueConfig.h, torque.rc, and Info.plist to  "${TORQUE_APP_ROOT_DIRECTORY}/source/ aka \My Projects\<apname>\source by request
2023-10-14 23:02:55 -05:00
Lukas Aldershaab a5e75dfd61 Make sure TORQUE_TARGET_PROPERTIES is populated before using it 2023-10-08 17:36:51 -05:00
Lukas Aldershaab bcea9bfc3a Support setting target properties and link options from modules 2023-10-08 17:36:51 -05:00
Lukas Aldershaab a4e3a000fb Fix Dynamic Library builds on Windows 2023-09-27 13:53:30 -05:00
Lukas Aldershaab d05d9b6cf1 Fix minor typo 2023-09-27 13:53:30 -05:00
Areloch 7819ca4037 Adds the hlsl and glsl wind deformation shader feature implementation code back into the cmake logic 2023-09-17 19:14:42 -05:00
Lukas Aldershaab 89b0c7f73b Console Refactor 2023-09-13 10:33:20 +02:00
marauder2k7 149f97119b Update CMakeLists.txt 2023-07-25 12:25:04 +01:00
marauder2k7 4098be88db Update CMakeLists.txt 2023-07-25 09:34:13 +01:00
marauder2k7 6eb051b5a4 disable mem mngr 2023-07-25 08:57:08 +01:00
marauder2k7 cf874b55e3 Update CMakeLists.txt 2023-07-25 05:21:59 +01:00
marauder2k7 192250cc7c last test 2023-07-24 23:24:12 +01:00
marauder2k7 2ef93acac6 define TORQUE_TESTS_ENABLED 2023-07-24 13:47:22 +01:00
marauder2k7 c09f79d199 separate testing environment
-Separate main for running unit tests
-Move unit tests into testing folder
2023-07-24 12:38:36 +01:00
AzaezelX 1c8af18b35 if a module lacks a cmakelists.txt or cmake file, yet contains a /source/ directory, throw in the .h and .cpp files under modules/modulename/source 2023-06-07 10:34:28 -05:00
AzaezelX 9f01515e78 library containment:
after execution of found cmakelists.txt files, searh the engine/lib and apname/data directories recursively for a *torque_postbuild.cmake file, including the contents, to ensure any values used, such as TORQUE_LINK_LIBRARIES remain in parent scope
2023-06-06 19:32:58 -05:00
AzaezelX 3ef60ffcb6 rework apple specific rpath assigns 2023-06-05 17:35:34 -05:00
AzaezelX db3e7984ad fix mac compile 2023-06-04 12:45:55 -05:00
AzaezelX 653580b469 get ogg working 2023-06-03 20:29:35 -05:00
AzaezelX 8906c12ddd kill dupe macro definitions, add macro(addFramework framework) for mac support to append frameworks, and further mark-as-advanced cleanups 2023-06-03 13:47:36 -05:00
AzaezelX 06f20a0476 correct a few cmake flags and options 2023-05-31 16:43:51 -05:00
AzaezelX 81ed240bf6 typofix 2023-05-30 20:00:20 -05:00
AzaezelX 60c27696ea get addDef back to working, add additional compiler flags win side to set the warning level back to 4 (and supress the more innocuous ones that we were doing previously till we've time for a focused pass there) 2023-05-30 19:24:35 -05:00
AzaezelX a14c7d7113 partial backport of the old addDef code. still needs fixup.
fix exe naming winside. todo: same for mac and 'nix
set startup project winside
2023-05-29 21:51:32 -05:00
AzaezelX 8d434807af more targetted fix for c++20
readd blacklist via a filterOut macro
2023-05-28 00:13:36 -05:00
Robert MacGregor 2f1d21eea6 * Feature: Re-add NFD support. 2023-01-22 21:13:39 -05:00
Robert MacGregor c672a27e76 * BugFix: Correct a mismatched if. 2023-01-22 19:57:04 -05:00
Robert MacGregor 1a76d3e84d * BugFix: Remove the absolute rpath removal to prevent build errors on MacOS in some cases. 2022-06-22 09:36:47 -04:00
Robert MacGregor b1d36c0cca * Feature: Add TORQUE_DYNAMIC_LIBRARY as an experimental flag to allow building the core engine as a shared library. 2022-06-01 16:59:06 -04:00
Robert MacGregor c90d3ddc2a * BugFix: Correct a variable overwrite issue causing headers to not show up on OSX. 2022-06-01 13:26:44 -04:00
Robert MacGregor 3d963d44e3 * BugFix: Allow header files to appear in the filters through use of a helper function torqueAddSourceDirectories. 2022-06-01 13:18:34 -04:00
Robert MacGregor 05cce33be3 * BugFix: Corrections to filter generation to properly separate modules and engine code. 2022-06-01 12:18:59 -04:00
Robert MacGregor 51bf96a290 * BugFix: Initial work on generating filters.
* BugFix: For now, comment out a line in libpng's CMake scripts causing issues on XCode.
2022-06-01 11:56:31 -04:00
Robert MacGregor a71ebf6ea8 * Feature: Add TORQUE_ADDITIONAL_LIBRARY_BINARIES for modules to specify eg. dll files to be installed next to the executable. On OSX this installs the file into the frameworks directory. 2022-06-01 11:02:32 -04:00
Robert MacGregor eaa18b42df * Feature: Add game/data to the default module search paths. 2022-06-01 10:48:56 -04:00
Robert MacGregor 0038a9d3f3 * BugFix: Clear the absolute rpath generated on OSX by default. 2022-05-31 10:00:01 -04:00
Robert MacGregor c1d1999a9c * BugFix: Correct MacOS bundles not referencing shared libraries properly. 2022-05-31 09:49:10 -04:00
Robert MacGregor 792a3cb461 * BugFix: Correct MacOS libraries being outputted to the wrong directory. 2022-05-31 09:15:54 -04:00
Robert MacGregor 4a36a998ab * Cleanup: Reorganize the engine main CMakeLists.txt for readability. 2022-05-31 08:30:11 -04:00
Robert MacGregor 342449625b * BugFix: Correct icon file handling on OSX. 2022-05-31 07:30:32 -04:00
Robert MacGregor 688f201011 * BugFix: Correct applications built on Windows or OSX not having icons. 2022-05-31 07:27:54 -04:00