Commit graph

47 commits

Author SHA1 Message Date
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
Robert MacGregor
f395c7d9ee * BugFix: Correct a few typos in the CMakeLists.txt.
* Feature: Mirror support for TORQUE_SFX_DirectX which appears to be
  broken anyway.
2022-05-31 07:08:18 -04:00
Robert MacGregor
b1cba705b4 * BugFix: Fix missing link libraries for Linux.
* BugFix: Fix calling a CMake function that was not available in the minimum Cmake version.
2022-05-30 22:23:36 -04:00
Robert MacGregor
128a50f635 * BugFix: Correct a typo. 2022-05-30 20:52:40 -04:00
Robert MacGregor
0dab9e2044 * BugFix: Add Xft to the Linux link libraries. 2022-05-30 20:51:39 -04:00
Robert MacGregor
9b8350dd2b * BugFix: Tweak the way dynamic libraries are loaded to the game directory and make FreeType a required package on Linux. 2022-05-30 20:43:08 -04:00
Robert MacGregor
3e74acaf8e * BugFix: Utilize Cmake's built in FindFreetype when building on Linux. 2022-05-30 20:39:17 -04:00
Robert MacGregor
790cb17435 Merge branch 'cmake_adjustments' of github.com:Ragora/Torque3D into cmake_adjustments 2022-05-30 19:06:24 -04:00
Robert MacGregor
13d632a503 * BugFix: Set DirectX linkages correctly. 2022-05-30 19:05:30 -04:00
Robert MacGregor
ffd6b09b1a * BugFix: Set the CXX standard to C++17. 2022-05-30 18:08:20 -04:00
Robert MacGregor
24707b38cf * BugFix: Correct the platformPOSIX sources not being compiled for Mac. 2022-05-30 16:45:35 -04:00
Robert MacGregor
7380161054 * BugFix: Correct convexDecomp compilation by setting the LINUX flag when necessary.
* BugFix: Update OpenAL to correct a compilation error on Linux.
2022-05-30 16:32:45 -04:00
Robert MacGregor
e071f1d901 * Feature: Implement template configuration at the CMake configure stage.
* BugFix: Correct some source references in the Engine CMakeLists.txt
2022-05-30 15:22:52 -04:00
Robert MacGregor
2ee56751dd * BugFix: Corrections to allow the Windows build to work correctly with D3D11.
* BugFix: Corrections to allow executables and libraries to build in the game directory without an install.
2022-05-30 14:22:59 -04:00
Robert MacGregor
49204fa88d * Feature: Dynamic library checker and installer.
* BugFix: Minor fixes for compilation.
2022-05-27 20:14:17 -04:00
Robert MacGregor
74faab3fb4 * Feature: Implement scanning for sub projects. 2022-05-21 20:01:23 -04:00
Robert MacGregor
b23554295c * BugFix: Correct some errors in the module scripts.
* BugFix: Fixes for compiling on Windows.
2022-05-21 18:07:14 -04:00
Robert MacGregor
dfc03da9d9 * Feature: Begin working the new engine module system. 2022-05-17 20:42:35 -04:00
Robert MacGregor
9901fa76b4 * Feature: Initial testing with module (file) searches. 2022-05-17 18:04:19 -04:00
Robert MacGregor
c3540acf94 * Feature: Remove the intermediate libraries and simply collate the sources into one target. This is necessary for eg. console function registration to work properly. 2022-05-17 15:42:30 -04:00
Robert MacGregor
786dac7419 * Feature: Obtain a building executable on MacOS, but need to resolve the crashing issues and multi-configuration settings. 2022-05-17 13:14:00 -04:00
Robert MacGregor
d7cdf54661 * Adjustment: Initial CMake reworking. 2022-05-13 23:42:41 -04:00