Commit graph

358 commits

Author SHA1 Message Date
marauder2k7 be3d26d9e6 SDL_FILESYSTEM
-Set the base dir based on build type
-enable only building active arch on debug
2023-10-22 00:47:14 +01:00
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 9bc06f0887 main dir
SDL_BaseDir was returning the directory that contains the app, now it returns the resources directory
2023-10-20 22:23:38 +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 a200554496 more changes
-Apple = more trouble than its worth
2023-10-19 11:45:25 +01:00
marauder2k7 c11587cad3 Attempt 2
-Missing includes may be due to no parent_scope
2023-10-19 11:04:16 +01:00
marauder2k7 ac60ce8da7 Update apple.toolchain.cmake 2023-10-19 09:58:55 +01:00
marauder2k7 1b49f28d19 move all setup to toolchain
-All apple config in toolchain
2023-10-19 08:57:24 +01:00
marauder2k7 e6c387c67a Update apple.toolchain.cmake 2023-10-19 08:29:27 +01:00
marauder2k7 13af296bf8 initial toolchain
-test of an initial toolchain setup for macosx builds
2023-10-19 08:08:50 +01:00
AzaezelX 76477a6e78 remove bad example template 2023-10-17 11:04:06 -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 df8041e689 Add support for replacing the main.tscript file with a specified Console Function 2023-10-08 17:36:51 -05:00
AzaezelX 62f4d443d5 more tools pseudo-module incorporation cleanup 2023-09-17 18:29:10 -05:00
AzaezelX a36a35c39e clean up folder display of optional core modules 2023-09-17 17:15:43 -05:00
AzaezelX 6a6eb0bbc7 extension point for os-specific configs, with mac example 2023-08-16 09:17:43 -05:00
Areloch cac793f437 Fixes up the libCurl module cmake config so it works as expected again 2023-08-03 16:18:57 -05:00
marauder2k7 d6a4c63c27 Update torque_configs.cmake 2023-07-24 12:59:27 +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 3f96225bca kill bad project assignment 2023-07-06 14:38:20 -05:00
AzaezelX cc037f7306 work around GLOB_RECURSE not... recursing... directories 2023-06-19 14:27:05 -05:00
AzaezelX 6d91cabaff unit test module cleanup 2023-06-15 20:19:39 -05:00
AzaezelX 79dffb1877 get gtest partly hooked back up. todo: engine/source directories only included when TORQUE_TESTING is on 2023-06-15 19:54:38 -05:00
AzaezelX c1daeffe06 kill redundant files 2023-06-14 21:43:56 -05:00
AzaezelX fa14b8c3a9 framework macro typofix 2023-06-12 09:01:50 -05:00
AzaezelX d4c73c8733 gtest cmake config convert 2023-06-10 19:26:18 -05:00
AzaezelX db3e7984ad fix mac compile 2023-06-04 12:45:55 -05:00
AzaezelX 1194f7f49d shift non-torque config flags over to lib/cmakelists.txt 2023-06-04 09:41:48 -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 e55d71f6ee macro and config refactor proposal 1 2023-06-03 10:42:04 -05:00
AzaezelX c61439c2f9 Merge branch 'cmake_adjustments' of https://github.com/Ragora/Torque3D into alpha41/cmake_adjustments
# Conflicts:
#	Engine/lib/assimp/INSTALL
#	Engine/source/console/fileSystemFunctions.cpp
#	Tools/CMake/basics.cmake
#	Tools/CMake/modules/module_testing.cmake
2023-05-27 18:18:17 -05:00
Lukas Aldershaab 1d28ddf734 Cleanup and improve 2023-04-06 15:28:09 +02:00
Jeff Hutchinson d4a6ea4628 Fix LibPNG on Universal MacOS + Bump minimum MacOS version to 10.14 2022-12-17 22:45:09 -05:00
Jeff Hutchinson 1940becb2d Compilation fixes for C++20 2022-11-28 21:39:06 -05:00
Bloodknight 6fed06b1e7 Update Assimp default importers 2022-10-02 20:14:53 +01:00
Brian Roberts 391b656e2c
Merge pull request #894 from Areloch/SMAA_and_Misc20220916
Implements SMAA and a few unaffiliated fixes
2022-09-16 23:11:39 -05:00
Jeff Hutchinson 0e1a5d6279 Update cmake mark_advanced for sdl and libpng 2022-09-16 19:23:16 -04:00
Areloch 5e9d7d63a1 Adjusts handling for httpObject class so that if curl flag is off, files are not included and references are disabled to avoid compilation issues
Adds SMAA anti aliasing
Adjusts AA option setting to properly work and facilitate SMAA
Added defaults for AA to facilitate SMAA
Updated brightness and HDR values on Example Level to comply more closely to the Editor default to give better default results
Fixed issue where ShapeEditor wasn't initialized properly when we'd open it from the Asset Browser
2022-09-16 16:16:12 -05:00
Glenn Smith 81f17f132b
Static link libcurl 2022-09-03 02:38:00 -04:00
Glenn Smith 1210acbee1
Windows curl options 2022-09-03 01:41:06 -04:00
Glenn Smith 01a719ee58
Update libcurl 2022-09-03 01:31:41 -04:00
Glenn Smith 20eb0a911a
HTTPObject with CURL 2022-09-03 00:54:26 -04:00
Areloch 04e108729e Adjusts logic for definingi TORQUE_DEBUG and TORQUE_RELEASE to be consistent across platforms 2022-08-04 14:01:54 -05:00
Robert MacGregor 5f50e7b70a * BugFix: Add bullet include directories to Torque when building. 2022-06-22 10:15:56 -04:00