Commit graph

88 commits

Author SHA1 Message Date
Azaezel
300abf0ecd blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux 2019-01-01 11:00:05 -06:00
Areloch
ee9f3b74ec Merge pull request #2254 from rextimmy/sdl_2_0_8
SDL 2.0.8
2018-05-30 20:37:00 -05:00
Tim
ad5d781cef cmake fix for apple sdl 2018-05-09 23:09:32 +10:00
rextimmy
925d8b27cf openal-soft updates 2018-05-09 20:48:18 +10:00
Areloch
570c6844f9 Makes it so the SDL directory files aren't copied during a template file install. 2018-04-03 23:58:03 -05:00
Areloch
963739102c Merge pull request #2182 from Areloch/AssetBrowser_Initial
Asset browser initial
2018-02-01 21:14:50 -06:00
Areloch
57284507f2 Adds the Systems for the Entity-Component-Systems setup. 2018-01-28 16:58:00 -06:00
chaigler
b52cda0c66 Remove legacy_stdio_definitions.lib
Dependency was added by PR #1566. No longer needed now that DX SDK has
been replaced.
2018-01-24 08:17:40 -05:00
Areloch
601d232223 Removes the LibMNG and LunGIF libraries, as they aren't actually utilized and just extend the build times. 2018-01-02 15:48:44 -06:00
Areloch
0c21ef1b45 Removes Entity/Component stuff from being behind an experimental flag. 2017-10-15 06:03:59 -05:00
Areloch
bc898e1150 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
Azaezel
5b7e973ad5 adress #1329 -flips off direc6tx sound by default 2017-08-09 02:53:27 -05:00
Areloch
adb875cb54 Conflict resolution with devhead.
Cleaned up a few remaining d3d9 references in the cmake file.
2017-06-01 23:54:44 -05:00
Areloch
1788bee4f6 Corrects an issue where a change to the target template may not generate the appropriate main.cs for that template after the initial build configure. 2017-02-27 17:10:08 -06:00
Areloch
8b4b467bff Merge pull request #1932 from Areloch/cmake_cleanse
Cleans up a few cmake options and flags
2017-01-31 09:47:08 -06:00
Areloch
08432978bf Merge pull request #1922 from elfprince13/perProjectCmakes
Optionally include a CMake configurations file from the project directory
2017-01-25 21:06:05 -06:00
Areloch
f43bfd6ca2 Cleans up a few cmake options and flags a most of the alsoft and sdl options as advanced so they're not cluttering up the regular view for no reason 2017-01-17 01:10:24 -06:00
Thomas "elfprince13" Dickerson
de53ac86c7 Somebody broke SDL when they updated it. The new version depends on AudioToolbox, so added that as dependency in torque3d.cmake 2017-01-13 10:44:05 -05:00
Thomas "elfprince13" Dickerson
f05a552c61 Optionally include a CMake configurations file from the project directory to support configuration changes that don't have to alter the whole engine repo 2017-01-11 18:03:21 -05:00
Areloch
d3dd5ce235 Merge pull request #1858 from Azaezel/options_ON
flips dx11, opengl, and sdl2 on by default now that those are no long…
2016-12-20 23:36:29 -06:00
Areloch
a3740719b1 Merge pull request #1817 from jamesu/ipv6_pr
Preliminary IPV6 Support
2016-12-04 16:22:42 -06:00
Jeff Hutchinson
0296e6d3fd Fix merge conflict and add check for unix and not apple for glx
Merge branch 'development-gg' into gladdev

# Conflicts:
#	Tools/CMake/libraries/glad.cmake
2016-11-02 21:55:24 -04:00
James Urquhart
704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
RexTimmy
3a0a720115 OpenAL-soft for windows 2016-10-22 09:22:33 +10:00
Azaezel
09cbb0df1a -Wno-unused-local-typedef surpresses unused typedef spam (in fastDelegate in particular) 2016-10-19 18:50:13 -05:00
Azaezel
132aed4c71 -Wno-return-type-c-linkage surpreses "extern C warning" spam reguarding nonstandard classes used in conjunction with the script trampoline macros. 2016-10-19 08:01:48 -05:00
Azaezel
16167b3250 filters false flags from clang compilation 2016-10-18 08:39:39 -05:00
RexTimmy
dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
Jeff Hutchinson
fd4628a08a glad cmake 2016-09-11 21:48:36 -04:00
Azaezel
714bf1afba flips dx11, opengl, and sdl2 on by default now that those are no longer experimental. also seperates out the dedicated flag for compilation on windows 2016-08-25 16:53:09 -05:00
rextimmy
7c011cdd27 CMake support for VS_STARTUP_PROJECT 2016-07-16 12:14:31 +10:00
Areloch
3a73344abb Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off. 2016-06-05 19:17:34 -05:00
Areloch
510b726f6f Final Linux compliance changes(renames, tweaks for gcc compliance, etc) 2016-05-29 00:58:02 -05:00
Areloch
ec8882c3c8 Ensuring all names are the correct casing for Linux 2016-05-26 01:37:14 -05:00
Areloch
f54fde9c6b Missing the preprocessor define in the project generation. 2016-05-19 23:42:38 -05:00
Areloch
03e6228e56 Adjusts the CMAKE install script to not install the E/C-related template files if that's not set as a flag. 2016-05-17 23:58:34 -05:00
Areloch
b04ad52b5d Ensure that inclusion of any entity/component stuff is properly bracketed with the preprocessor check. 2016-05-15 10:11:46 -05:00
Areloch
a63a636d03 Fixes the blacklist filter in the event we aren't using SDL to avoid including an unwanted file dialog codefile. 2016-05-05 22:59:17 -05:00
Areloch
e8bc70e514 Merge pull request #1567 from JeffProgrammer/epoxy
Added Epoxy in favor of GLEW
2016-05-05 19:40:59 -05:00
Areloch
ec6f9c05a6 Integrates the nativeFileDialog library to enable native file dialogs on the major platforms. It is activated with SDL. 2016-04-30 15:48:33 -05:00
Jeff Hutchinson
fddc00b39b Merge branch 'development-gg' into epoxy 2016-04-17 23:59:42 -04:00
Areloch
131090f1b7 Made the cmake SDL flag a regular, non-advanced option so that it's not hidden from the base setup on Windows. 2016-04-06 21:21:55 -05:00
Areloch
6a40b8bb84 Merge pull request #1559 from rextimmy/dx11_clean
Direct3D11 Support
2016-03-29 00:51:23 -05:00
Jeff Hutchinson
b89d2a116e cmake for epoxy and rip glew 2016-03-25 13:38:40 -04:00
Jeff Hutchinson
e9efc05ebb fix release build compile with MSVC 2015 (finally) 2016-03-24 14:22:45 -04:00
rextimmy
bd60f3be1a Direct3D11 CMake and Project Generator files. 2016-03-20 21:55:40 +10:00
Areloch
1f72245772 Some cleanup and adding in the necessary changes to cmake. 2015-10-13 15:50:30 -05:00
Areloch
31afbedfb6 Merge pull request #1346 from eightyeight/fix-threadpool-tests 2015-08-21 00:07:55 -05:00
Azaezel
6d121299ec -wall leads to incredibly long compile times (we're talking 5 minutes vs 80, here) 2015-08-03 17:09:53 -05:00
Daniel Buckmaster
d68c9036bf Include thread tests in CMake. 2015-07-05 14:11:58 +10:00