Commit Graph

126 Commits

Author SHA1 Message Date
Lynix e70b1f57ae Fix compilation for CodeBlocks 16.01 ! (Fixes #65)
Former-commit-id: 4cddcf427228260249ac1578283896ee2b7ecbfc [formerly 7bf4124ba228559456f38f4247116ed71a45c227]
Former-commit-id: 2b1a728de56c163627fcb6b59231102708f57513
2016-06-09 13:02:02 +02:00
Lynix 70167ce106 Build: Fix build on Premake4
Former-commit-id: 90e0b92e48bbb285a95db0300a8eeaa4125f4d81 [formerly c9fe9513e9e4b6ce4fb53a2f2a2f61f779f756e8]
Former-commit-id: ca9ea9c6931d4857af7f0aab8f43465eb462dd2e
2016-06-09 12:32:04 +02:00
Lynix 14541deb76 Build: Fix with-extlibs option being required for compilation
Former-commit-id: d549ed954e4285f34399e610e3dcfde33c0ad83d [formerly 239e7cd99680e8bd35fdde4e0e137818f1b1bce9]
Former-commit-id: 5233a5e6923162f630bfa186192259123d1ab3da
2016-06-01 13:52:59 +02:00
Lynix b6be16b3c3 Build: Add server option, allows to compile only the server-side part of Nazara
Former-commit-id: 28347f372b3d4b0afef0fcf8f54ebf45589470a3 [formerly b432be7d6e4404bd1c5a10c4b0a7ef43fceed307]
Former-commit-id: 1622472689c5f87d5d77ffe391f1dde9cece815d
2016-06-01 13:51:32 +02:00
Lynix 5d98ce3639 Build/Vulkan: Fix compilation under Linux
Former-commit-id: 3223e11738aad41c0d8716050392b0ddc23d8384 [formerly 68a2ae998cae8c84718f6cf074d2f09d4142296c]
Former-commit-id: 9d6edbe4792cc8ed56315489d2b2c29dfe178089
2016-06-01 09:36:01 +02:00
Lynix 4ab05c2803 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: bdbe1aab7fe7f0241069aa2d9ab444897ba471cd [formerly 5fd04e51e2a7441252ef56f136bd9d81df380f75]
Former-commit-id: d326241827c4021980631a210603c4d5b77cf6f3
2016-06-01 08:42:58 +02:00
Lynix 1f0d54fd82 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: ba6e0fe9352936373aa45d9e7a56ed97efa71c22 [formerly 770aab17f7e563d8331acac45f70b9647e35ae21]
Former-commit-id: 6c6612c4608021d7e6af7ae79b737144fc9f64f3
2016-05-31 13:25:03 +02:00
Lynix 6d4a09022b Physics: Add new libraries for Windows
Former-commit-id: 93deb21045e66e786819066593dad466e7ce9742
2016-05-31 09:06:24 +02:00
Lynix 9a2a19a834 Build: Fix default platform on 32bits os
Former-commit-id: a068dac229fce61efa32634ff616309c91a66079
2016-05-30 13:52:08 +02:00
Lynix ea920d2e64 Build: Fix linking for audio and utility system for POSIX
Former-commit-id: 3eee15c4df5795b05a36fad43b5ae2a93de9152a
2016-05-30 08:50:49 +02:00
Lynix 044882bb31 Build: Improve build
- Help linux default to 64bits build in case of 64bits OS
- Fix linux linking with tools


Former-commit-id: 31ea427401fd4fb12b453e8517b2cb4f24ded094
2016-05-30 08:48:22 +02:00
Lynix 1042ba6584 Merge branch 'master' into vulkan
Former-commit-id: 2de61dcc322505af741e4b7c09d375df6d5363e4
2016-05-17 20:25:51 +02:00
Lynix c31f70af55 Build: Copy all dependency modules to the example directory
Former-commit-id: 13e9d585df15ecc727c140b30dbd5e83e3997b5f
2016-05-16 20:02:59 +02:00
Lynix c0b5ac2529 Build: Make every lib copy its binaries (and dependency bins) to the example/bin folder
Former-commit-id: 02571367a0af738197066d4a17446e203b389d31
2016-05-15 00:38:19 +02:00
Lynix ef66c09719 Merge branch 'master' into vulkan
Former-commit-id: 5e11ffb71a4deddeaa44a1b1e93aeea97525bd9c
2016-05-14 13:58:06 +02:00
Lynix 190462fd31 Build/Tool: Make Assimp plugin copy its library file to the example directory
Former-commit-id: eaf807d1f7f5148413dd7ab8729cdf52113ba5d8
2016-05-05 23:36:53 +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 371922ec11 Build: Rename .bat scripts
Former-commit-id: 9124b087eb795f1b52e1f3702130c63b6176f667
2016-05-03 23:04:56 +02:00
Lynix f4c2254ea2 Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan
Former-commit-id: 9e6d7ac5c8457d7128e00e6eeae0344ca02d6727
2016-04-30 11:45:19 +02:00
Lynix bb8ad9369f Merge pull request #61 from TaoSc/master
Updated features page and assets' optimization

Former-commit-id: dfb0009b0da61831de41d03ed48d7b17e0787d2a
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 9a11c39fa7 Cleaner looking features page
Former-commit-id: 85ab37bc15b1bf4d64261304b4989c8d7ccab9de
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
Lynix 3051b6bdde Sdk/Build: Fix linking error in non-united mode
Former-commit-id: ace2ebdd84755b5031c372242ff9cec896251e3b
2016-04-21 13:30:10 +02:00
Lynix 6808d60cc1 Sdk: Remake LuaAPI internal
Former-commit-id: 297c30dbeca443d934edfd8d889cd7a6c725d0e1
2016-03-31 22:51:10 +02:00
Lynix 946d2cea7a SDK: Add global headers (improved global headers script)
Former-commit-id: f04a3526b185c6c5b8025168cd56829898082bc6
2016-03-03 14:10:52 +01:00
Lynix c46af20b5e Build/SdkServer: Excludes Graphics Lua API file
Former-commit-id: ae25551cf432eff08a505ad34b3332bf7ef79b88
2016-01-24 15:32:17 +01:00
Lynix d7ab29e5ef Fix and improve last PR
Former-commit-id: 16afead68e42411402dfb5a7bd957a4940b6f83a
2016-01-24 15:20:14 +01:00
GigAnon 7dec6e10a6 Merge remote-tracking branch 'refs/remotes/DigitalPulseSoftware/master'
Former-commit-id: e13918db0bc7a95763cffd3bb9360faa7662c1dc
2016-01-20 14:15:51 +01:00
Lynix d0ff07d262 Build/SdkServer: Fix Console.cpp being included in the project
Former-commit-id: 62d706654c398a60946282e112d7e139107ac745
2016-01-20 14:08:03 +01:00
GigAnon 450b80716e Trying to fix premake
Upgrading to premake5 fix Visual Studio 15, but breaks Code::Blocks.


Former-commit-id: 75d7a3b01616b5b5e7f9cdf376ebd8386336219c
2016-01-19 17:54:21 +01:00
Lynix cfe7c79991 Sdk: Add server-side module
Former-commit-id: 4df27d1e44d791aad234d095af08ae3c19660fba
2015-12-13 16:36:38 +01:00
Lynix 1bbf038cc6 Network: First commit
Former-commit-id: ec8697acc51569f5043e4f70e4cf42f1c5dc487c
2015-11-09 15:02:25 +01:00
Lynix 69d98fa724 Revert "Build: Make compiling with make easier by adding a native plateform"
This reverts commit ee268879a325e3f62741e57dbe8790fbcc78498f [formerly 3720c0c8924e277e5cab757cc1950adba88bd66b].


Former-commit-id: 2314caedebd2b98ea2fba756c27d4edc76fb0e5c
2015-09-28 21:38:33 +02:00
Lynix b711f47304 Build: Make compiling with make easier by adding a native plateform
Former-commit-id: 2b12eff243fba3ce25a3cd4634ac18b351b18f49
2015-09-28 21:27:17 +02:00
Lynix 05056d41de Build: Fix project generation for Linux
Former-commit-id: 9e0787779d9c8fa84f3f41a6f75e7bf29be403d4
2015-09-28 00:41:59 +02:00
Youri Hubaut 752518ef14 Fix module compilation on linux
Former-commit-id: 205c6578fd50e506ec7d6012e73fea0c14c744d9
2015-09-27 15:37:45 +02:00
Lynix b16abf0d09 Merge branch 'master' into NDK
Conflicts:
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua
	include/Nazara/Renderer/OpenGL.hpp
	src/Nazara/Core/String.cpp

Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
2015-09-20 23:41:21 +02:00
Youri Hubaut a4032abe63 Fix compilation on linux
Former-commit-id: e7ff20401c32d0f7752d03636b5034a3467bf498
2015-09-19 17:10:34 +02:00
Lynix bef0736295 Build: Disable VS Minimal Rebuild (in order to enable /MP)
Former-commit-id: 3dd5ea9e59060c9991be55271c6619c6c226e61e
2015-09-19 13:38:30 +02:00
Lynix 252adbf191 Build: Fix support for windowed tools
Former-commit-id: 35513cbde7cddecba27256919c0ebd5cc8d56160
2015-09-19 13:37:29 +02:00
Lynix a61f968d05 UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")
Former-commit-id: 5639305bbdbb69ad6f6f282df6c6de930220b57f
2015-09-19 01:14:19 +02:00