Commit graph

75 commits

Author SHA1 Message Date
Areloch
4b1f421df4 Merge pull request #2238 from Areloch/SDL_Install_Fixup
Makes it so the SDL directory files aren't copied during a template install.
2018-04-05 00:30:48 -05: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
LuisAntonRebollo
30bf15f4ee Fix Linux rpath. Changed to use $ORIGIN. 2015-03-08 20:40:35 +01:00
LuisAntonRebollo
265d1a540a Fix Linux rpath. 2015-03-07 22:41:00 +01:00
LuisAntonRebollo
744e7d4745 Merge remote-tracking branch 'GG-Github/development' into dynamic-CMake-modules
Conflicts:
	Tools/CMake/torque3d.cmake
2015-01-30 18:24:38 +01:00
LuisAntonRebollo
5583e73ca5 Fix for CI server on gcc Linux. 2015-01-24 23:28:12 +01:00
LuisAntonRebollo
4e9034854d Linux implementation. Include changes for gcc x64. 2015-01-24 22:08:26 +01:00
LuisAntonRebollo
aa35157eef PlatformSDL implementation. 2015-01-19 01:17:37 +01:00
Ben Payne
09d1df4bed Fix executable naming for cmake builds 2014-12-17 15:27:02 -05:00
Ben Payne
58f07aecb4 Fix CMP0043 cmake warning when using cmake 3.0.2
COMPILE_DEFINITIONS_CONFIG has been deprecated, use generator expressions
with plain COMPILE_DEFINITIONS instead (available since 2.8.10)
2014-12-17 14:03:51 -05:00
LuisAntonRebollo
dd08fd2e7d Add OpenGL support. 2014-11-08 20:21:50 +01:00
Scott Przybylski
f527b45ec2 Make torque3d.cmake load all .cmake files from the module folder.
Move option code to each individual module.
This makes it so you can add a new module without having to modify the torque3d.cmake
2014-10-10 23:50:05 -07:00
LuisAntonRebollo
535f56af6e Merge pull request #801 from eightyeight/gtest-tests
Googletest tests
2014-10-02 01:31:13 +02:00
LuisAntonRebollo
42386b3f6f Merge pull request #795 from BeamNG/T3D_x64
Support for Windows x64 builds
2014-10-02 01:31:07 +02:00
Daniel Buckmaster
6cc59a97cc Added CMake flag for unit tests. 2014-09-29 11:38:47 +10:00