Commit Graph

64 Commits

Author SHA1 Message Date
Jérôme Leclercq 8bef707de2 Update .gitignore 2021-07-07 22:51:52 +02:00
Jérôme Leclercq bfab451633 Remove resources headers (as they will be generated on compilation) 2021-07-07 22:44:38 +02:00
Jérôme Leclercq e716b44aa3 Add tests and SDK 2021-05-17 23:08:37 +02:00
Lynix c963a3064b Add missing resources and update .gitignore 2021-05-16 23:46:43 +02:00
Jérôme Leclercq 24c2de405f Improve xmake build 2021-05-14 03:35:32 +02:00
Jérôme Leclercq 2641117847 Add building using xmake and cleanup thirdparty 2021-05-14 03:35:32 +02:00
Jérôme Leclercq 07a02ecfcd Update .gitignore 2020-09-01 18:45:02 +02:00
Lynix e4348349da Merge branch 'vulkan' into shader-nodes 2020-05-27 20:04:37 +02:00
Lynix 68208f5426 Merge branch 'master' into vulkan 2020-05-27 19:48:22 +02:00
Jérôme Leclercq 1425f99edf Merge branch 'master' into SDL2 2020-05-27 11:11:21 +02:00
Lynix c26f3b9b71 Add shadernode (big WIP) 2020-05-18 19:55:12 +02:00
Lynix 8be2342f25 Merge branch 'master' into vulkan 2020-02-23 00:46:48 +01:00
Lynix 7f4145786f Update .gitignore 2019-09-25 09:37:40 +02:00
Lynix 6c733ec197 Add VS2019 shortcut
+ include premake projects by default
2019-07-21 11:18:36 +02:00
REMqb 848f05a420 ~ Initial SDL2 implementation
Limitation
- Dependent projects need to set NAZARA_PLATFORM_SDL2 if nazara has been build with SDL2 since OpenGL.hpp (and maybe some other headers) exposes platform details
- SDL2 window doesn't supports async window since the API isn't fitting for now
- Contexts parameters can't be changed until we close all the SDL windows (SDL limitation)
2019-04-03 21:17:06 +02:00
Jérôme Leclercq 7d54ac4c10 Merge branch 'master' into vulkan 2018-02-13 13:06:01 +01:00
Lynix db7f778672 Build self-hosted lib in a different folder and .gitignore it 2018-02-07 18:18:55 +01:00
Lynix 9944a228b5 Merge branch 'master' into vulkan 2017-07-04 22:41:29 +02:00
DrLynix f8357526b9 Update .gitignore 2017-01-20 17:55:08 +01:00
Lynix e6e4a437bd Merge remote-tracking branch 'refs/remotes/origin/master' into gui 2016-11-30 13:08:08 +01:00
Lynix e0935edd00 Merge branch 'master' into vulkan 2016-11-21 00:32:57 +01:00
Jérôme Leclercq 9e9b01eff5 .gitignore: Ignore GMake build files 2016-11-06 21:30:49 +01:00
Jérôme Leclercq 482eeafdb7 Remove save-failed file 2016-11-04 18:31:15 +01:00
Lynix 1df3201b39 Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan 2016-10-28 18:46:51 +02:00
Lynix df24519230 Merge remote-tracking branch 'refs/remotes/origin/master' into gui 2016-10-27 18:36:47 +02:00
Lynix a05f9222ee Build: Output plugins binaries to plugins/lib instead of plugin/NAME/lib 2016-10-17 14:14:17 +02:00
Lynix cf7465f7db Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan 2016-10-11 17:24:03 +02:00
Lynix 05dd93c549 Merge branch 'master' into gui
Former-commit-id: b5a6eba7494e7595000e3c7e1f3c77077485519f [formerly 74e8b34c50d86cea8be86dcc5d9b82e112db9277] [formerly 07e6a0bd2e00dcb9517c6ddc1d9ca7d3326707ae [formerly 59878811e379ef9bfd66e6fd0a0f32eaa39dcc6b]]
Former-commit-id: b7a83377bc61d378410ce33748ab63357ee53abb [formerly d789d8762086eb0dd43e0cef08f1edfbd8d346f2]
Former-commit-id: 7aa71e252bf91965f8f488dd9396e6287607edf9
2016-10-10 22:10:36 +02:00
Lynix 10a1e16566 Build: Add package action
Former-commit-id: 515307c1cb9d10f2a6060f7ae107b969637e8882 [formerly bcb26c49c374e502732e3bff35f8367047accdc5] [formerly 72385d39c30f735fb43d70da3c44840468360efa [formerly 6563ce60169674309fdf8e36e16686b1b0be128e]]
Former-commit-id: fbc9522ed2c0e75f58a3517344d780be3eb99ac4 [formerly ce264fe175de40c051229183d458273ad6cbead1]
Former-commit-id: e312993f3cab7e1587bc09feb0e25ec289237224
2016-09-25 01:56:05 +02:00
Lynix 9762acab62 Merge branch 'master' into vulkan
Former-commit-id: 783e31e1f02fea8f9cd5080dc5295eead00ba1ce [formerly 7bf4eb3cc900923a8b3483b45e73333954a9c143] [formerly bd47f3386b2ccaa49ab5a45d874ebcdd653df81f [formerly 60494c4bdb49e4c3cfbdd97f048ee9e5b7b3a81d]]
Former-commit-id: eea148c75240307741b212eff37937ae325d323d [formerly df04c665b6bddd805665558928d8b16938c719fc]
Former-commit-id: f69cd1b0f1762bb2c4a289e553207adbd622ac5a
2016-09-15 00:45:22 +02:00
Jérôme Leclercq 40763370b9 Example/HardwareInfo: Fix generated file
Former-commit-id: 52bf3fe6fae3381602479acc4c3eff893ce1bd2f [formerly 6ee9d195ce38bf504de0c9b56be4efe0878c2fa4] [formerly c5b7e5223a061866b3dbaa5ba90a4f22b8af66dd [formerly a8ebb981b3161b7610b1f62dbeaace151cc92d54]]
Former-commit-id: 8a13ef79c41673716f8ddce6b9085f69e38ee429 [formerly a6b9c3201bc80717308147b42b082b5a4d0260cf]
Former-commit-id: 8f4ca3784b3ce027eea7a6b69e2418aef02824ee
2016-08-20 17:12:20 +02:00
Jérôme Leclercq 1018daa1e5 Example/HardwareInfo: Fix generated file
Former-commit-id: 630e7c09a608ae3442d7f75ca7957938db505cb5 [formerly 886fb7052439151c752641117daa78a8d2f8d2ef] [formerly 2ad36b2270b027ecb31330a021229d60aad6e94e [formerly c641ef9008276b7891b2509cc78281c52f22a1e3]]
Former-commit-id: 7f3ec7800d291c3ac45ed2ed69b51b96564ada4f [formerly 3df9d6ce614593a2b3dfaa28dc88ef50a432def5]
Former-commit-id: e4fff6791544525cbeb0e9b2de43c8845475fad6
2016-08-20 17:12:20 +02:00
Lynix e9f888b550 Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan
Former-commit-id: 2d7b8f2258dcb13272482a886aa88e780bffd307 [formerly ffaa87cb5564013addc8749dff6589f732ffe599] [formerly 6792cc9d7a87711eab92875da19bc4200e4463d6 [formerly 0a51ed831d274b1e325cc2efc57016094a7aee83]]
Former-commit-id: b16416186770928262bc982969e9dbf10308d121 [formerly 92dc66185439cf46dcd3fb4672061d75d003d508]
Former-commit-id: 34072644c9bf88918998070201d9b131ea5b3731
2016-08-08 08:54:09 +02:00
Lynix 5ece0e35ab Add build/config.lua to .gitignore
Former-commit-id: 6dca505992e40866a85de509c540c09bdb9ebbc3 [formerly 0cb39cbb71ba523d02a88895707302ed378ddec6]
Former-commit-id: 18aa6ec9509c49bfa9e0fd555e29dc8c05e84e37
2016-07-29 23:56:38 +02:00
Lynix 528842b11c Add build/config.lua to .gitignore
Former-commit-id: c6e30e048553752e79e14b2284f30a8d11606904 [formerly 7b9f1d013e1a871438733d854455b15d64fe0ccd]
Former-commit-id: 4b65dc81e89fc13ded4e948c7bdbb56379dc89e6
2016-07-29 23:56:38 +02:00
Lynix 8e9deee43e Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan
Former-commit-id: 7d8b0c7ab7d9dd9b2da8c6e0f6061d5314437686 [formerly 26c96fcff07aa0b1c0a3b95f18be3c29e03c9d88]
Former-commit-id: 04d8b83c2bb7719a83bcda40be25752fa4c7dd81
2016-06-12 23:00:33 +02:00
Lynix 0cc1986460 Update .gitignore
Former-commit-id: f406588a3ab4c6a38ef868f099be34d27c35ca9c [formerly c4e39da58aafda2d21775f94062e59818fce3612]
Former-commit-id: 8b62ec060e6bdb6b4a26533f1d3a145a1606a0bd
2016-06-12 12:46:38 +02:00
Lynix 002a3666bf Update .gitignore
Former-commit-id: 8f2692032677ec82978048becff61a5fa662bbc6 [formerly b2776b19ded063f59df50d2095325e2d7c13a2fe]
Former-commit-id: d67437e4be7a6558d7706cc36fc0bee26b5cc077
2016-06-12 12:46:38 +02:00
Lynix 65f43182f6 Remove Visual Studio 2015 database file
Former-commit-id: da62e49ea2b8860bcd4025d4add74980d458f5ca [formerly c79c0719d67cd594c90f0be4c8f6c83ccca4fd50]
Former-commit-id: b3e346736b0401296f4eab6bd374cd1d04a3c94a
2016-06-01 09:34:42 +02:00
Lynix 8d13b0ae0b Remove Visual Studio 2015 database file
Former-commit-id: 226c236bf00b16ed560ed977663fe28175da5d82 [formerly 11db0f829d9edc279600b9d921c96753da809d70]
Former-commit-id: 14e19aa18248ad6e87017df04a299cfb3bc5ea5d
2016-06-01 09:34:42 +02:00
Lynix 60164a1a7b Remove VS database file
Former-commit-id: 6eb1442b4c61a9647fd65db28dfdc121ba0eab1a
2016-05-20 17:37:03 +02:00
Lynix 7e037e4d6f Build: Add an option to copy the built library to the example directory
Former-commit-id: e9b2df26e19917355e3bbc486892f2aeead2ae0e
2016-05-05 23:36:34 +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 922e49accb Ignore more VS stuff
Former-commit-id: 3239565791c7e4841d373d60a55aa5ffa0a56a36
2016-04-17 19:39:34 +02:00
Lynix d7ab29e5ef Fix and improve last PR
Former-commit-id: 16afead68e42411402dfb5a7bd957a4940b6f83a
2016-01-24 15:20:14 +01:00
GigAnon 33f8e9775a Updated .gitignore
Added rule to exclude unit tests binaries
Added rule to exclude more VS15 files


Former-commit-id: 11ea17c814e2bdc8162f58ac8a3392d2d67c9c0d
2016-01-20 14:08:18 +01:00
Lynix f71886e66d Add Doxygen file
Former-commit-id: 2413ae175784c830c88bc282e58d0c4880e70202
2015-12-01 13:40:40 +01:00
Lynix a01ab22160 Ignore all files in lib directory
Former-commit-id: 907efa506c63f6e5bf6ea9932545bdd59aacd704
2015-06-16 00:32:07 +02:00
Lynix 58f8ffac35 Move libraries to specific directories (depending on the compiler)
Former-commit-id: 7b9c7141036ae01ca1d269c0748200ec4d069312
2015-06-15 13:41:50 +02:00
Lynix a6092be930 Move all build files to build directory
Former-commit-id: 499125a81d877144aabe7d89bb69043b92872b24
2015-06-14 01:47:02 +02:00