Commit graph

177 commits

Author SHA1 Message Date
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 b6c9bef48f revert nativeFile
-NativeFileDialog m file was not being set to obj-c, now we force it withe set_source_files_properties.
2023-10-19 16:29:04 +01:00
marauder2k7 8c4650d5dc NativeFileDialogs
-Needed to change nfd_cocoa to an objc++ file with mm extension
2023-10-19 15:47:16 +01:00
marauder2k7 0af0b5a24a MACOS working
Mac working in this stage
2023-10-19 14:39:22 +01:00
marauder2k7 13af296bf8 initial toolchain
-test of an initial toolchain setup for macosx builds
2023-10-19 08:08:50 +01: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
AzaezelX c67a8f0440 clean out bullet temp files 2023-08-02 11:03:34 -05: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 c70e436350 Merge branch 'SDLUpdate_2_28_1' of https://github.com/Areloch/Torque3D into alpha41/cmake_adjustments 2023-07-23 13:54:39 -05:00
AzaezelX 020754b7b2 Revert "update sdl to 2.26.5"
This reverts commit 0e44e165bd.
2023-07-13 16:01:25 -05:00
JeffR 083d2175ea Updates the SDL library to the latest standard bugfix release 2023-07-13 15:20:29 -05:00
AzaezelX 80437b3515 suggested sdl compile fix 2023-06-17 15:07:12 -05:00
AzaezelX 52093cbde5 Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/cmake_adjustments 2023-06-08 13:31:34 -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 8284604315 hide extra mac-side compiler flags 2023-06-05 10:39:28 -05:00
AzaezelX 916e722922 correct overstep 2023-06-04 23:20:03 -05:00
AzaezelX 39bb7fb7b3 supercede ASSIMP_BUILD_NO_OWN_ZLIB config 2023-06-04 21:13:45 -05:00
AzaezelX f6bd20afe1 shift zlib to first compiled library, shift mark_as_ASSIMP_HUNTER_ENABLED to a (hidden) option to attempt match the assimp define 2023-06-04 18:49:24 -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 c147cda110 additional library filters 2023-06-03 14:59:23 -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 df24913f79 flip off assimp warns as errors 2023-05-31 17:10:56 -05:00
AzaezelX af88962d04 gtk check 2023-05-31 17:07:05 -05:00
AzaezelX 06f20a0476 correct a few cmake flags and options 2023-05-31 16:43:51 -05:00
AzaezelX 0ab5860286 assimp compile fix mac side 2023-05-28 18:42:48 -05:00
AzaezelX 6e6f785bab Merge branch 'alpha41/sdl2_26_5' into alpha41/cmake_adjustments 2023-05-28 12:04:34 -05:00
AzaezelX c3f53b99ea update assimp to 5.2.5 Bugfix-Release 2023-05-28 11:19:45 -05:00
AzaezelX 360edf18a1 quick collada compile fix as a straight update would pull in the boost library as well for yet another dependency 2023-05-28 00:14:37 -05:00
AzaezelX 166128dd73 update NFD to 67345b80eb 2023-05-27 20:47:21 -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
AzaezelX 0e44e165bd update sdl to 2.26.5 2023-05-27 10:16:20 -05:00
XXTH a81c6ebd06 clean up 2023-05-12 11:42:06 +02:00
XXTH e0ab3830af bsd ready 2023-05-10 14:58:47 +02:00
AzaezelX 0ce2da3a23 clean up math varsize complaints 2023-04-27 16:10:04 -05:00
Lukas Aldershaab 1d28ddf734 Cleanup and improve 2023-04-06 15:28:09 +02:00
Robert MacGregor 2f1d21eea6 * Feature: Re-add NFD support. 2023-01-22 21:13:39 -05:00
Bloodknight 16f3710058 Update Assimp from 5.2.3 to 5.2.5 2022-10-02 19:21:41 +01: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
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 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 0b15bc25e0 * BugFix: Correct Assimp building its own copy of ZLib. 2022-05-31 20:42:49 -04:00
Robert MacGregor 4efd59ceb3 * BugFix: Add missing oggvorbis/theora support. 2022-05-31 09:05:02 -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 eab544c8f3 * Adjustment: Update libsdl to address a bug in compilation on MacOS devices. 2022-05-21 20:25:30 -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 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