Commit Graph

175 Commits

Author SHA1 Message Date
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
Lynix a09f859144 Build: Fix support for executable tools
Former-commit-id: c6a986ed730d5d5eac043fbf66434821aa6f6839
2015-09-19 01:12:57 +02:00
Lynix dea48a289d Merge branch 'master' into NDK
Conflicts:
	include/Nazara/Core/ConditionVariable.hpp

Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
2015-08-21 12:49:05 +02:00
Lynix c4c8904aca Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
Former-commit-id: 25bdf44e4ef7458a50ab60cd5f6bd49522528c23
2015-08-20 21:17:47 +02:00
Lynix 2847f262b2 Build: Enabled multi-processor building on VS
Former-commit-id: c62e66a548b36e81a3816bff9457691f203a1f73
2015-08-20 21:17:41 +02:00
Lynix 4d5cea8afe Build: Switching to C++14
Former-commit-id: 05e737521493d41df024932c731079a22b838681
2015-08-20 13:28:31 +02:00
Lynix ec21416231 Build/Common: Fix double execution of actions
Former-commit-id: b7279f39c57f3f2b1974642525dd4dea3d412781
2015-06-21 14:54:29 +02:00
Lynix b3597d5330 Build: Fix library directories
Former-commit-id: 7bf4a9078e03e0de9ec8ab3df2303d4e3eb9e031
2015-06-15 21:14:20 +02:00
Lynix b680bb68c8 Build: Change vs2010 shortcuts to vs2013
Former-commit-id: 58dab51754396ea1118e608867a19fd347d0063c
2015-06-15 20:44:34 +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 32a217ea1b Build: Now handle 32/64bits the right way
Former-commit-id: 5769c92df0994e91e7098df37612893fb51fdf8a
2015-06-14 16:17:02 +02:00
Lynix 71e595fe49 Build: Rework build system + introduced SDK build file
Former-commit-id: 90727a78031a83753404d2fe09a6347315a00a39
2015-06-14 15:48:16 +02:00
Lynix a6092be930 Move all build files to build directory
Former-commit-id: 499125a81d877144aabe7d89bb69043b92872b24
2015-06-14 01:47:02 +02:00
Lynix aee0812505 Build/Graphics: Fix conflict
Former-commit-id: 48015e97d5e7a6b06406c7867f6119fa6be7c38a
2015-06-13 23:28:01 +02:00
Lynix b2a248d6f5 Merge remote-tracking branch 'origin/BuildSystem-Update' into NDK
Conflicts:
	build/scripts/common.lua
	build/scripts/module/audio.lua
	build/scripts/module/core.lua
	build/scripts/module/graphics.lua
	build/scripts/module/lua.lua
	build/scripts/module/noise.lua
	build/scripts/module/physics.lua
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua

Former-commit-id: 8374b17a214e0efbdc7d35e81ed809f8dc9d3b79
2015-06-13 23:26:34 +02:00
Lynix 1fc17c8b53 Separate NAZARA_API into multiple defines (one per module)
To fix inter-module dependency


Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0
2015-06-13 22:31:29 +02:00
Lynix 251e21f006 More VS fixes
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
Lynix 656290d089 Core/Bitset: Add comparison operators
Former-commit-id: 7ca04f36fa001f322182c5e9457127f05432d373
2015-05-19 14:31:04 +02:00
Lynix 54f954208e Script/Features: Update TaskScheduler
Former-commit-id: bb2659b892103880402cf7443847fa1cb66a19c2
2015-05-19 14:14:22 +02:00
Lynix 90e4a1ca52 Core/HardwareInfo: Added GetTotalMemory
Former-commit-id: 71289723115161dd253ccb65c1c91af65344c678
2015-05-19 14:13:48 +02:00
Lynix 95cb02c41c (Features) Fixed typo
Former-commit-id: fa5a551d876f513ec941af0069d8997c8aee7940
2015-03-18 20:32:14 +01:00
Lynix 6648fbe577 (Features) Fixed typo
Former-commit-id: 6f2d3c3327f18e29507eedc9a1275bfe3ca4fdb3
2015-03-18 17:26:21 +01:00
Lynix 5c52698131 (Feature page) Improved design.. I guess
Former-commit-id: 42db15aed57eeb9650d7c4566fa778831815c1ab
2015-03-18 17:19:55 +01:00
Lynix 12c238ddae Added feature page generation
Former-commit-id: 9d1b3db59f4d13ceb69212c289925c198eb14bc6
2015-03-18 17:11:24 +01:00
Lynix debe39501e Added experimental new build system
Former-commit-id: ab7fb35db6be4b975d0558680c840d72e38562f9
2015-01-20 23:37:49 +01:00
Lynix a89adfe551 Fixed Freetype not being linked to Utility
Former-commit-id: 4bbfced926430defe35d6ef800954cdb0f2f6c2a
2015-01-17 19:41:38 +01:00
Lynix ba8aed916f Renamed unicode option to parseunicode
Former-commit-id: 600c6fd480d9e96c90319b367545dd5199a10664
2014-12-17 13:54:44 +01:00
Lynix ca54b6cdca Updated module headers (generation)
Former-commit-id: a9a2e4eaeda16caa67989ae81c55ac090b1454de
2014-07-11 10:23:19 +02:00
Lynix c4b10dddda Big config/debug update
Added config checkers
Macro no longer use suffixes
Moved MemoryManager to upper directory
Renamed *_MEMORYMANAGER to *_MANAGE_MEMORY
Renamed AUDIO_STREAMEDBUFFERCOUNT to AUDIO_STREAMED_BUFFER_COUNT
Renamed CORE_REAL_PRECISION to CORE_DECIMAL_DIGITS
Renamed DEBUG_MEMORYMANAGER_DISABLE_REDEFINITION to
DEBUG_NEWREDEFINITION_DISABLE_REDEFINITION
Renamed GRAPHICS_MAX_LIGHTPERPASS to GRAPHICS_MAX_LIGHT_PER_PASS
Renamed UTILITY_FORCE_DECLARATION_STRIDE_MULTIPLE_OF_32 to
UTILITY_VERTEX_DECLARATION_FORCE_STRIDE_MULTIPLE_OF_32


Former-commit-id: 81ef836ac9f092ac471f60e544bb7c7c6370593c
2014-07-08 10:56:37 +02:00
Lynix 2776ce9f4a Fixed Audio module compilation
Former-commit-id: 6ce67eacb51d71a1bd5f3e3e05a14a615c4b12ea
2014-01-19 00:57:39 +01:00
Lynix 5876e1c17a Removed OpenAL static linkage from Audio module
Since OpenAL is loaded dynamically


Former-commit-id: 6d45daa73a78e4a050316c1f23040a528148049f
2014-01-15 14:38:54 +01:00
Lynix 3026d8b9ac Optimized resource encoder
Is now three times faster


Former-commit-id: 39397911e4b87d1831d15a32d7125a707c353bf7
2013-11-26 15:59:49 +01:00
Lynix 0e99205046 Fixed rendering
Resource encoder now store unsigned char instead of signed char


Former-commit-id: 648dd1d55facd40bc37075291782a54cbbc4811f
2013-11-26 15:25:43 +01:00
Lynix 14f513f656 Resource encoder now print module name
Former-commit-id: 14e782da2b803f3c4847e19c9f46872f641c0c7a
2013-09-20 21:46:30 +02:00
Lynix 197bddb6ba Transformed "Encoded shaders" into "Encoded Resources"
Former-commit-id: ead4cc9bb162d2f9e5c08756575e84f3a9056679
2013-09-20 16:20:51 +02:00
Lynix 7f2888a346 Remade shader encoder
Former-commit-id: f96b33ed36650931c78b58fae6d7fc7f68efab20
2013-08-26 10:46:58 +02:00
Lynix f1dc7b98e5 Separated Shaders from Manager
Former-commit-id: 7faddbd38bd729b2778f09be3f98105ef5219740
2013-08-25 19:55:03 +02:00
Lynix cca920e597 Enabled GCC vectorization
Former-commit-id: f585c662924d7167457373633ee0df424bbe9cdb
2013-06-19 15:23:40 +02:00
Lynix 783e609c8e Fixed warnings and optimized noise module
Former-commit-id: 62840540e2938d08436a22d4e19d801466f1d6ba
2013-06-17 23:58:06 +02:00
Lynix 6ccde01bee Fixed United build option not including all files (Close #13)
Former-commit-id: 8e9da1c6fa7e65ac5285abdd3f358c033c9f2174
2013-06-17 17:29:33 +02:00
Lynix a3f8d058ec Fixed some warnings with Visual Studio
Former-commit-id: e783a55f47e9cfd8a08eced14d19e5eb03b864d8
2013-06-09 16:26:29 +02:00
Lynix 1fba4eaddb Added build file
Former-commit-id: cdf061966451f28f5785692232340aeadf6192f4
2013-05-26 23:07:24 +02:00
Lynix 278a15de62 Nazara will now build on 64bits target
I used a new MinGW package to build these. If your doesn't work, use :
64bits:
http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.0/64-bit/threads-win32/seh/
32bits:
http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.0/32-bit/threads-win32/dwarf/

Former-commit-id: 406181e292648f3bcd7431617c4db55eab7d918f
2013-05-03 12:16:32 +02:00
Lynix 645e4961d8 Remade build shortcuts
Former-commit-id: 740348a8bcb2cc9f9c66543dbca554b9ddf13ee9
2013-04-12 16:49:00 +02:00
Lynix 143707bc2e Added extern libraries (Made STB one of them)
Former-commit-id: 0ca555e9f035600924c7c23fff06bc3810051fdf
2013-04-12 15:12:11 +02:00
Lynix 34dbd19385 Merged 2D and 3D modules into Graphics module
Former-commit-id: 33bf0fbe727e50e864bc52680c95a106ada508e9
2013-04-03 01:14:55 +02:00
Lynix 30995694e9 Made 3D need 2D
Former-commit-id: bd563f6c363a13775cfdbbcf83df76405b4ccd90
2013-03-02 00:29:01 +01:00
Lynix eda1f5ebab Added 2D module
Former-commit-id: 4e1ad41928e04e9de4b4288b973f37b6eb0755db
2013-03-02 00:28:22 +01:00
Lynix 1cde574790 Global header generator now includes date/time
Former-commit-id: 36d082b5afe2f1ba3c4db04e22f5fca23d014230
2013-02-20 17:10:49 +01:00
Lynix be12026a30 Fixed HardwareInfo not compiling
Former-commit-id: 70f193cc041f431970c4dd6a0d9993ff5fedc659
2013-02-13 01:33:40 +01:00
Lynix 492d01cc09 Fixed HardwareInfo OpenGL include
Former-commit-id: d45ca9ac45a883a5378d527ef3ffe6594dcd02f1
2013-01-05 23:42:13 +01:00
Lynix ebd4512614 Fixed 3D module building
Former-commit-id: 14f2b8a787f7c316ca039a119d731f2843467acf
2012-11-25 15:09:31 +01:00