Commit Graph

142 Commits

Author SHA1 Message Date
Lynix e46267d8ae Build/Assimp: Fix assimp rejection
Former-commit-id: 46fc5f3b3fd749e86afe6298cb5337ae90f02784 [formerly c271946a1cbb2924f8d79a9d7c3691c7b23c69e8] [formerly 356ec1662b9e3186da7ac6720b7affec617357e4 [formerly 159894148bb93cadef56126939147c24ff340152]]
Former-commit-id: d2e03b0875bb5a7a57817d68fe8b559fd5ba1ad5 [formerly 6ff57bf039f291f64a35cd2c0987b989adea851f]
Former-commit-id: 6673c2d846855701a289a74e01bb2b2fc61bfb25
2016-08-17 13:05:41 +02:00
Lynix 5ad6132998 Build: Fix TargetDirectory not being taken into account
Former-commit-id: a022d3dc07743529a3c9523149f264add20ebe44 [formerly 81e2340920ab4565129751cfd9ad74d7c1f71c18] [formerly 1bcaa5dcf97ff705b2e26bf78cbc76830eb3fae0 [formerly cab3c7a3e8af6b72e720a7dfa858d6a03e8bd7cf]]
Former-commit-id: cee0ce949787d64407b7b982b2d7287ef0c96481 [formerly eea525a514121da003f8b88c225192b361c65568]
Former-commit-id: df9ea49de0575753e5e8c800e306701a6ca9f899
2016-08-17 12:59:12 +02:00
Lynix d14367a5a6 Build: Remove Vulkan from modules list
Since Vulkan support is not yet finished and pushing it to master was a mistake, I see no reason everyone should link against this module when using the engine.

Former-commit-id: 3677345c89ed98648bec5d5fc17a5bb49fdab639 [formerly 7361217fde5359d88e4d5965d0375e5a452c84b5] [formerly 6d7d9a618df41f44363349523bb7abcd94be43b4 [formerly aea0ceefe1d8b588a611d117092726a55b8ff172]]
Former-commit-id: 3984dcee08dc6ce208f8c71218674ff0d46c8772 [formerly 755848f28a4097a05809515c26f0ff35b344cc31]
Former-commit-id: 9bc57ddd341ef468ea78c8781402329b498c0502
2016-08-17 12:20:58 +02:00
Lynix 5ebff77ef0 Fix compilation with GCC/Clang
Thanks to @Gawaboumga


Former-commit-id: c2ecad3d8c0bad06cb47b906829585c8d0b910c0 [formerly 7790b792e730ed65c3e8b8dddbd91b1527631e2e] [formerly ae62fe532d14dd33bfc88cf7bca1d19e63487a3f [formerly 41b273ee595cc56c6145651fb4caa1ceca0b2bf6]]
Former-commit-id: 7d4c3b3d0b48235a6c3534154c5787738440b2ae [formerly 96dcb709ba81c5696ba633b06e887007d5d9caf5]
Former-commit-id: 2a2013af6d26bb64362d1edd2e6aacaac000708f
2016-08-10 22:17:55 +02:00
Lynix 554c17702b Build: Fix empty install commands
Former-commit-id: 7083dfd9716873707791d46bc1fe333a6e229712 [formerly a8122cb99bcf5023ffad732fbf8d2b922faf1252]
Former-commit-id: b9913ad6e47551044afd0259f9a1b64b82b1a743
2016-07-31 12:59:04 +02:00
Lynix 9d018485cb Build/NDKServer: Fix dependencies, allowing it to exists in server mode
Former-commit-id: 8130fc4bd6898f21d08bfad37e3b54676ee34b96 [formerly 9f64adc84777930b63419690bf0e454582989158]
Former-commit-id: 3838886ff2303fe94b69403e1cab51cc4c99a05c
2016-07-31 11:01:47 +02:00
Lynix 8f50162924 Build: Fix command line arguments being ignored if config.lua loading failed
Former-commit-id: a21dc17f960e089dc3f8a2330def494660c682a9 [formerly b776370d7fc80107c412fe91526de7d11d53d501]
Former-commit-id: b5df17fcceeba1996b06c7fa92abf8616a2a8006
2016-07-31 11:01:07 +02:00
Lynix 9576759abb Build: Add a separate config file and library/binary search paths support
Former-commit-id: f875de03150e6c505816bf526bc0432c9fffccac [formerly 52eef94d32a8b41b1381cfc63fcb5eb1e058f2b9]
Former-commit-id: 22da03a49982c4f48a1feb6cf7319b07949ad295
2016-07-29 23:47:09 +02:00
Lynix 99fde96fee Build/UnitTest: Fix linking against Network module
Former-commit-id: 01a994a6bf23fa8296ef087157d3d88598c1bb31 [formerly 929a9a29884daa2676c9e54f55361ecbd742fe37]
Former-commit-id: d5437f0a27908e9e8a87e04aff14ddbb3c849b07
2016-07-26 21:00:43 +02:00
Lynix 31bc8604a4 Build/Assimp: Fix compilation error because of missing includes
Former-commit-id: b13f32ba6a53da69c8243425ca19766c96b97d26 [formerly 66000790be4f8ebe750ebe0d241f764b668278a1]
Former-commit-id: 1da2a2b75eb42f118a1b843463fe715bd5fbabb0
2016-07-18 19:07:12 +02:00
Lynix a277e7560f Build: Fix example path
Former-commit-id: 54e56da81ea8c93da5ec276035dca59a62932ed0 [formerly ab7201812c22e7a4dcabbfbf74686a169a67a1b0]
Former-commit-id: 48aaf02c04cea375eeb33b64afc09428631ee523
2016-06-13 21:19:12 +02:00
Lynix c528640d80 Fix a shitload of warnings in 64 bits mode
Former-commit-id: 5bc0c622c20eae45df51bb1ee62e5ed566e58a1b [formerly a8befbed30cb897ce876fd3b46a3585e1b70613e]
Former-commit-id: 999225e414c0d6a3e9c6868f040b68045b2ba724
2016-06-13 21:09:55 +02:00
Lynix 6eca751ee5 Build: Fix typo
Former-commit-id: 014f7894f5879ffa2cbddfbfe3382b150b9b5e52 [formerly d9ce35fac610af8ffe36ec8fac91f828ee58a9ab]
Former-commit-id: c2e8b01db7fed181200243f3a40e8e2c8f5ed62d
2016-06-12 12:46:56 +02:00
Lynix 49650a94f3 Build: Remake install system
Former-commit-id: 5103cd29d3959802747d7d06bc9b90bc272215d4 [formerly 7c3ea867b6439d721f255306d812b5d10a3efe1a]
Former-commit-id: 5b5ab11770402db34a14df80b9ad6c1ce3fecaca
2016-06-12 11:39:31 +02:00
Lynix d42ae34c4f Build: Remove duplicate
Former-commit-id: beac603acc691f30a232da2ae1def9e588f79b5d [formerly 5ca9b1d0c8df0562ad7a016c8c7b3fab136a9959]
Former-commit-id: 14269fa79790ecf6a4f01b276aa153c5dad4148b
2016-06-12 10:14:36 +02:00
Lynix 92f7961056 Build: Convert spaces to tabs
Former-commit-id: e0e4844838f16f006941d7152883cbfa04ea9913 [formerly d65a47fe81387c65a7ae32b9b38ad9a8fc4c2713]
Former-commit-id: a97e57d33ba27c7b9f3e97d0ff86736b75211df9
2016-06-12 10:06:27 +02:00
Lynix 926cbbea98 Build: Remove -fPIC on Windows
Former-commit-id: 76c37366073ebdb5ff1ecb0ad61ee746806195ed [formerly 920a28d07dabee120584c778271d95e863a39fa1]
Former-commit-id: 2f8dbf0c075f6e2638da31e9ca69cbef1b832912
2016-06-12 10:03:39 +02:00
Lynix 6819d4a26c Build: Remake exclusion system
Allows to excludes pretty much everything and now also excludes projects
relying on an excluded dependency


Former-commit-id: 5260c724bd0b7ee82e58abdd16c99d0b78772c08 [formerly 3b107d86de1501964ea8f5babcdac4488759282b]
Former-commit-id: 00b7cbc69751720da768efd56beca9ba6143cd32
2016-06-12 10:03:05 +02:00
Lynix f74f180044 Fix compilation for CodeBlocks 16.01 ! (Fixes #65)
Former-commit-id: f49f9b662c6e105d1249f7f7839f8a711be87640 [formerly ab9e2158aebc0583790b52d6397015fe470c0a31]
Former-commit-id: d68b86c1319bdfd956b226865831e7c2d0a5ea42
2016-06-09 13:02:02 +02:00
Lynix 5fb16724e6 Build: Fix build on Premake4
Former-commit-id: e4b767d8f806cf4350145d4b89fc875efb6c5c38 [formerly 342808bdd0ca5aa81301db4e5aa7656716a7323c]
Former-commit-id: ba1724ff6d933ca7b101873857d489a9d51092ff
2016-06-09 12:32:04 +02:00
Lynix 26ccf59ddd Build: Fix with-extlibs option being required for compilation
Former-commit-id: d6045b270db38412f5f323f025afb3fb85f703aa [formerly e5d7be10ada92f2351a4349b57c59b637108c4a3]
Former-commit-id: 93146150699c9d9c7ad524eeccb126ea66257f26
2016-06-01 13:52:59 +02:00
Lynix 7626f9c5e3 Build: Add server option, allows to compile only the server-side part of Nazara
Former-commit-id: 60be2c3eb2835984714192a55faebf8c769fd127 [formerly f3dcb15e44dfab997d4c10c97aa34270f5c884bf]
Former-commit-id: 6f11439b3e53a812c5adf28413ea084fb2964f21
2016-06-01 13:51:32 +02:00
Lynix 2e26509f1c Build/Vulkan: Fix compilation under Linux
Former-commit-id: db46f107c70d50eac8f84bc7fdecac163325569d [formerly c3c6b1938470eab0199d2740d4546606830cc4e2]
Former-commit-id: 33457d04147c6ac16211b3d854a266d071306744
2016-06-01 09:36:01 +02:00
Lynix fe079bf566 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 92e5665db87f810ea4e93729248ddf0d2cd16c1e [formerly 562b7d56979496c390b03d30cc7a709935c954d4]
Former-commit-id: f8b1a7bbef8e659068b0c320300166970bf6a3f6
2016-06-01 08:42:58 +02:00
Lynix 64f49cd162 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 40b9e664b314de916f3a368eb4f9bdeec4656106 [formerly 3d8f980ec64eb6b03c6396052e05226b0ba003f3]
Former-commit-id: 62557219dcab794f14d8244c7a36e62dfa952b53
2016-05-31 13:25:03 +02:00
Lynix f19117e84f Physics: Add new libraries for Windows
Former-commit-id: 55870046787c3c3ae067f09d1ab1c8cb2114f2ca
2016-05-31 09:06:24 +02:00
Lynix 79c15d6271 Build: Fix default platform on 32bits os
Former-commit-id: 01a32275da73f662048a9acb4750c43e7d483305
2016-05-30 13:52:08 +02:00
Lynix 3e4051d82c Build: Fix linking for audio and utility system for POSIX
Former-commit-id: b6bf529230e967996fa27d5636aeedc9f78d6e73
2016-05-30 08:50:49 +02:00
Lynix 6959e0bde6 Build: Improve build
- Help linux default to 64bits build in case of 64bits OS
- Fix linux linking with tools


Former-commit-id: c6444a691a8b0be6e85b284c60cc3f43056eee01
2016-05-30 08:48:22 +02:00
Lynix 7e63e8fdb6 Vulkan: Wrap vulkan queues
Former-commit-id: 9fff47e3efbb8ce7b2c70be9a468627b7e8a1340
2016-05-19 18:33:47 +02:00
Lynix 840b03691a Plugins/Assimp: Fix stack corruption
Former-commit-id: 15b1c22cd0bbb1601e23b1e4bd037fe0cc13ab24
2016-05-18 00:44:58 +02:00
Lynix d2c372247f Merge branch 'master' into vulkan
Former-commit-id: f91a339c32e2ab8f0ef3fd2cfc5c038ceccdc401
2016-05-17 20:25:51 +02:00
Lynix 4ecc701ad2 Build: Copy all dependency modules to the example directory
Former-commit-id: e6c2cb47433d84c17e7277125180469f2b3f0d37
2016-05-16 20:02:59 +02:00
Lynix 59b9e96f21 Build: Make every lib copy its binaries (and dependency bins) to the example/bin folder
Former-commit-id: 6f966190fd910968615553f4c9250d2f14a5c726
2016-05-15 00:38:19 +02:00
Lynix 6fa8b38976 Merge branch 'master' into vulkan
Former-commit-id: 875dd773cefa6dde4744443851378e33bfab0ab8
2016-05-14 13:58:06 +02:00
Lynix 5d2fa3ce98 Build/Tool: Make Assimp plugin copy its library file to the example directory
Former-commit-id: c24dd8b79f56353a4b5b43b7e8de1ff0c672eb05
2016-05-05 23:36:53 +02:00
Lynix 1e3225d1b4 Build: Add an option to copy the built library to the example directory
Former-commit-id: 78618a92f864e75c1c46f478a1cfc57726188b89
2016-05-05 23:36:34 +02:00
Lynix 1d3d6a4d1a Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan
Former-commit-id: d09d354e223654aaa253d680f53609464bae3873
2016-04-30 11:45:19 +02:00
Lynix d558ef6edc Merge pull request #61 from TaoSc/master
Updated features page and assets' optimization

Former-commit-id: e54a4ef6ccb784f6a606fbeb4474edc20b9e9076
2016-04-30 00:46:32 +02:00
Lynix 81e2c3817a Build: Add support for Linux, BSD and Solaris
Former-commit-id: 2f7f1e74fd101d688977ceb5129027cb1fa4a67b
2016-04-29 20:54:42 +02:00
Lynix 0aac3ab33e Build: Improve code and allow to be platform specific about everything
Former-commit-id: 7f13e1a49ad33da26c1841ee550c9de03303cd80
2016-04-29 20:34:03 +02:00
Lynix 1742fa9457 Merge branch 'master' into vulkan
Former-commit-id: fd9f2f119e959847d4d9eabece7b678243b26bde
2016-04-29 20:12:27 +02:00
Lynix 4996b158c2 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: b649a1ff5716046c72a1720777e4675a57689bca
2016-04-29 18:47:33 +02:00
Lynix 34b7260d54 Plugins: Add Assimp plugin (WIP)
Currently load only static meshes


Former-commit-id: 61dee8f53a423d6d170bd3bfe72e71daa63e8c5b
2016-04-29 14:22:14 +02:00
Lynix 95cb384897 Build: Add support for OS-specific defines
Former-commit-id: 7181f755cfc2640e862e496db96909fdbe485072
2016-04-29 09:03:05 +02:00
Lynix 432022c5b7 Build/Vulkan: Add Win32 define
Former-commit-id: d1bd3db4f8e89c3a8ea3544fb6dab744781b76bb
2016-04-29 09:02:24 +02:00
Tao Schreiner ab4777b9e8 Cleaner looking features page
Former-commit-id: 558b682d896f6ed9def6f5b55851f6968ebf3c6f
2016-04-27 03:00:35 +02:00
Lynix 22a31c72ed Vulkan: Add loading of Instance/Device
Former-commit-id: 0184f78824900bd46cff94dbfe829b126b8c984d
2016-04-24 02:28:26 +02:00
Lynix 4a948dfaa9 Merge branch 'master' into vulkan
Former-commit-id: 8e5cf8f5c93203818a1939df269593f8556019f0
2016-04-23 22:57:14 +02:00
Lynix ddf75e852a Vulkan: Add empty module
Former-commit-id: 89e01819b36aeda5bfadac35d8a4190256461eca
2016-04-21 13:38:58 +02:00