Commit Graph

62 Commits

Author SHA1 Message Date
Lynix 99b631d82f Fixed linking of tools on GCC 64bits
Former-commit-id: b6191b5aabb5378a242f271e7faa511ea09feebd [formerly 68387e1786d721c8eb657c0217bf4c80422b7c51] [formerly e2e5f1c8a221f350e695829c669a4c6af16c2635 [formerly c7b894f99a2d70988792b12914a1f411d4112855]]
Former-commit-id: 3a873af915fd03188b03c1a9c5215b1568f2e333 [formerly a12848832f2df0e659f99741958ed970e8a42c46]
Former-commit-id: 8273bf5e11447fb9628bf17c517be9f3ffec0bd8
2016-08-19 01:49:36 +02:00
Lynix ef0ddb5ef1 Build: Fix an oopsie
Former-commit-id: d1411c2e1f1ee8ce5d2773c0834e2e9c06732a21 [formerly 0dff837b8db9c262dd71dec1ba83fe4f36b98de7] [formerly 70f74c0e185d1a8bbd791ddd1316b5b2df92a50a [formerly 95ff56ebb91662f7e9211c79d7af9e14f6a3f403]]
Former-commit-id: f5e08860c71fc922d7aab1ea584b22b99862773b [formerly 76482eaed8258fdc0ebe82736a52d6cf6b711201]
Former-commit-id: 5b7c4ba98d7f9bb5485dbca7bb24cc9890125cd9
2016-08-17 13:11:52 +02:00
Lynix 62ebc3e8cf Build/Assimp: Fix assimp rejection
Former-commit-id: 0565c70bb35215b3bcda0368d709730055161827 [formerly 5272f3ad85542d2f45e0314bf399d12a6d656fff] [formerly 39a37805566ce1dea9f8a0bccdfebe989ba50142 [formerly 827c3b178b687946ef7559735d4325b4d4f7bd42]]
Former-commit-id: 0796fc3248fb234361eb6bef14a76faa0a824056 [formerly b96bbddabdf7708aa8522632b0e860590a0d7db4]
Former-commit-id: 7377a548aa94c75f22d8d3c420df8fb7e33b0d2b
2016-08-17 13:05:41 +02:00
Lynix d9423b873b Build: Fix TargetDirectory not being taken into account
Former-commit-id: 34c501043fa1c585f0773b662725ff58673ab589 [formerly 44f9516100c88cb4170123b4ddab01f449aeb5ed] [formerly 3e07d12226333e80ee24280ada1b57e31f15d4cd [formerly 86f8902caefeb9a7112fe1ff9c9617173f6a67bb]]
Former-commit-id: 5cdbb7ea7193e3a8caa74154e86941df4f5571b1 [formerly 4719afc062ad3de9317863b505c7facd76a1b8d8]
Former-commit-id: 94fba8a695ddcc5f70de6e1607fd4782f468d851
2016-08-17 12:59:12 +02:00
Lynix 3eceba1770 Build: Fix empty install commands
Former-commit-id: b1bc095ab7394364acbeaf672f6d4c6dcbfc2c71 [formerly 1b44b6b1fea962ed28b401f36c2ad12a8324ef2a]
Former-commit-id: b2193ae86ce18618874827a440ab23abeb83a5e6
2016-07-31 12:59:04 +02:00
Lynix 57883a7b45 Build: Fix command line arguments being ignored if config.lua loading failed
Former-commit-id: a470b669576a19af85ad21a72aac5278a5854235 [formerly 35cbe605f6afaf9eb360485722970eddda1c0a2e]
Former-commit-id: e227cb5319776be03179e4a2233bbbe24bc819ac
2016-07-31 11:01:07 +02:00
Lynix bd5d29bfda Build: Add a separate config file and library/binary search paths support
Former-commit-id: c5b7ea15c0bd997ad50635f4490351fd6ca7f13c [formerly 2ba3f77346f260ec75a3e3e981511cbe62cc88a8]
Former-commit-id: d439e3c333c1ce1a1c215b42af51258532258199
2016-07-29 23:47:09 +02:00
Lynix 328eb1eff9 Build: Fix example path
Former-commit-id: c104dbdfccac0d7d7077892ba0b032a65e48148c [formerly 8473fbaa59917b99ee9f056703465b15cf1be59a]
Former-commit-id: 6f7b90b6d834ec10135549fbe7fed952393cf3c6
2016-06-13 21:19:12 +02:00
Lynix 086de1f71c Fix a shitload of warnings in 64 bits mode
Former-commit-id: d3d40b9f364a0a27a3411586e62a16443ee5de00 [formerly 71282c40087232985fa19b8dcbd0d75bd4fcd97b]
Former-commit-id: c11c69d4c1f40bdd33f721cb33c68c4144771510
2016-06-13 21:09:55 +02:00
Lynix 3ab0192300 Build: Fix typo
Former-commit-id: c6e701b0d0d00de1eb3c4d56dda0d9e91b06e269 [formerly 0edba6686872452fef0254c062dbc437f1d7c84c]
Former-commit-id: d6d30517f3427e503a405ac79ca7a148f09c1b2b
2016-06-12 12:46:56 +02:00
Lynix ee553f350a Build: Remake install system
Former-commit-id: a1d7d75ffefb60273d190e7355df500267429538 [formerly 6ab4c02f186ce23201d15a8677a66e5babc05a41]
Former-commit-id: 2a820557c58fbc70c2cecad9e4404db09d5e219c
2016-06-12 11:39:31 +02:00
Lynix 3c44253685 Build: Remove duplicate
Former-commit-id: 4539c4439bc95450c25a5313717f7127e2df9bcc [formerly 7763558ed34a29a17c95a8d764d5a4aa3e5f110b]
Former-commit-id: 4dbe1d56f3fdbd3d35e7108da0487c95749bbe57
2016-06-12 10:14:36 +02:00
Lynix 6d70d5c562 Build: Convert spaces to tabs
Former-commit-id: 012a57ead09735cf346b2157b5342879eedd7f02 [formerly a57f164e5a38c7c8978163b6cd9feb527588dc38]
Former-commit-id: efbc1d0f7043207c1f59d671f9d44a9a7ca1b663
2016-06-12 10:06:27 +02:00
Lynix ff4275dd1c Build: Remove -fPIC on Windows
Former-commit-id: 9e466b02938c8acc45546322f626a3fb4da8901b [formerly 7df8219ca32705a8465f9254831bf930936ad7c5]
Former-commit-id: 87993d189c4d1014bb07312a874e58575ccd7d8a
2016-06-12 10:03:39 +02:00
Lynix 36a02ee92d Build: Remake exclusion system
Allows to excludes pretty much everything and now also excludes projects
relying on an excluded dependency


Former-commit-id: 4ee05227cbddfca9b42816d4571ef09ce6977093 [formerly d1885a398214640f22abf949ae45c18acb13440b]
Former-commit-id: 3a10037c0f732aa76b3ddeb438abd86d5e5ff478
2016-06-12 10:03:05 +02:00
Lynix 7c7e602dc1 Fix compilation for CodeBlocks 16.01 ! (Fixes #65)
Former-commit-id: 866d4b0fe5b9c00c0c1a540402137b24fca3ce19 [formerly 0a8f011fd6c53a4da5cbcc55b8c13dc9c279f879]
Former-commit-id: 8a43b0610624a37de2395b703cbf3de4024393e5
2016-06-09 13:02:02 +02:00
Lynix 799b44ee3f Build: Fix build on Premake4
Former-commit-id: 3b02c5be8d00056d0d1f1074d87f8026c17d258d [formerly 2a93ebe2625da9241b1dec2b353cae8f97e1e4e1]
Former-commit-id: f2a5f42b6be6fa748381746454cfc5a0cd150e0c
2016-06-09 12:32:04 +02:00
Lynix e846934960 Build: Fix with-extlibs option being required for compilation
Former-commit-id: 41219e06c9f0a05221440eefb6268222757af8e1 [formerly fdb27339a5b90fce1bbea576012c72c433615e23]
Former-commit-id: e979847fb2bc6d6f80b9fc02956d08113bae1e39
2016-06-01 13:52:59 +02:00
Lynix 37f32bdb13 Build: Add server option, allows to compile only the server-side part of Nazara
Former-commit-id: 15080ac65f3186acf31967ae275d1aceeb2bd0dc [formerly 8eb6896afe9c6d63b5772a4c2237a6bf81c5b524]
Former-commit-id: 8f75843edf54398dcd74487829cf2af857704524
2016-06-01 13:51:32 +02:00
Lynix d03b0d759d Build: Fix default platform on 32bits os
Former-commit-id: 4d6c477bfb8516ec6665c92adf1cba6be1d5eed2
2016-05-30 13:52:08 +02:00
Lynix bffa500d88 Build: Improve build
- Help linux default to 64bits build in case of 64bits OS
- Fix linux linking with tools


Former-commit-id: cacdaacf29cf2a14a46926c69e996b7d171b0d6a
2016-05-30 08:48:22 +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 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 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 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 d7ab29e5ef Fix and improve last PR
Former-commit-id: 16afead68e42411402dfb5a7bd957a4940b6f83a
2016-01-24 15:20:14 +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
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 a09f859144 Build: Fix support for executable tools
Former-commit-id: c6a986ed730d5d5eac043fbf66434821aa6f6839
2015-09-19 01:12:57 +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 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 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 251e21f006 More VS fixes
Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
2015-06-13 19:42:07 +02:00
Lynix debe39501e Added experimental new build system
Former-commit-id: ab7fb35db6be4b975d0558680c840d72e38562f9
2015-01-20 23:37:49 +01: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