Commit Graph

2422 Commits

Author SHA1 Message Date
Tom van Dijck
acfa41b697 Fix the oven to store the global container in the project and configs. 2016-03-06 16:37:55 -08:00
Tom van Dijck
745a135d5c Merge pull request #440 from LORgames/ssurtees/vstudioLinkerCleanup
Cleaned up vstudio linker elements
LGTM
2016-03-01 08:12:59 -08:00
Samuel Surtees
bf783483da Merge pull request #441 from starkos/fix-vs-warning
Fix a new Visual Studio unused variable build warning
2016-03-02 00:25:17 +10:00
Jason Perkins
51d5be7547 Fix a new Visual Studio unused variable build warning 2016-03-01 09:20:29 -05:00
Sam Surtees
a0242bb955 Cleaned up vstudio linker elements. Fixes #150 2016-03-01 22:11:33 +10:00
Jason Perkins
0b6ad5b532 Merge pull request #439 from LORgames/ssurtees/schemaFiles
Added support for schema files in C# projects
2016-02-29 08:22:18 -05:00
Sam Surtees
7886b04642 Added support for schema files in C# projects. Fixes #416 2016-02-29 21:39:32 +10:00
Samuel Surtees
1d2ff195bf Merge pull request #437 from Blizzard/debugargs-fix
Debugargs/debugdir fix.
2016-02-27 19:08:59 +10:00
Samuel Surtees
c49e2f12a6 Merge pull request #438 from Blizzard/lua-contrib
Move lua into 'contrib' folder, and build as any other 3rd party lib.
2016-02-27 19:01:57 +10:00
Tom van Dijck
7b30174492 update bootstrap.mak 2016-02-26 08:23:27 -08:00
Tom van Dijck
d7581b6dae Move lua into 'contrib' folder, and build as any other 3rd party lib. 2016-02-25 15:39:49 -08:00
Tom van Dijck
745c640312 Merge pull request #436 from Blizzard/disable-warnings-contrib
disable warnings in contrib libs.
2016-02-25 14:23:13 -08:00
Tom van Dijck
74adb3e727 Final debugargs/debugdir fix. 2016-02-25 14:22:07 -08:00
Tom van Dijck
13d9866ce9 disable warnings in contrib libs. 2016-02-25 14:02:51 -08:00
Jason Perkins
5683010f7c Merge branch 'debug-settings' 2016-02-25 15:21:35 -05:00
Jason Perkins
eaeba51b4e Use %{prj.location} to make new debug settings more portable 2016-02-25 15:21:25 -05:00
Tom van Dijck
1410c55af7 debugargs & debugdir defaults for convenient debugging. 2016-02-25 10:43:21 -08:00
Tom van Dijck
95d840b4f0 Merge pull request #424 from Blizzard/build-settings-cleanup
clean up the build settings a little.
2016-02-25 08:41:54 -08:00
Tom van Dijck
aed7334237 clean up the build settings a little. 2016-02-25 08:29:23 -08:00
Tom van Dijck
7021ed2d43 Merge pull request #433 from LORgames/ssurtees/UUIDFix
Fixed issue with incorrect UUID being generated for groups
2016-02-25 08:24:10 -08:00
Sam Surtees
43dc8ccbcc Fixed issue with incorrect UUID being generated for groups. Fixes #100 2016-02-26 02:04:08 +10:00
Samuel Surtees
bfc342632c Merge pull request #432 from LORgames/ssurtees/xcodeUpdate
Updated xcode submodule for frameworkdirs usage
2016-02-25 23:33:54 +10:00
Sam Surtees
8fbbd7d949 Updated xcode submodule for frameworkdirs usage 2016-02-25 20:45:38 +10:00
Samuel Surtees
8a648f0241 Merge pull request #430 from lwjason/master
Add Build Customizations option
2016-02-24 11:11:26 +10:00
Jason Perkins
60b7acd2f4 Merge branch 'release-alpha8' 2016-02-23 15:50:04 -05:00
Jason Perkins
b3d5976461 Switch back to a dev version number 2016-02-23 15:49:29 -05:00
pohan
ae22c2bcd4 Remove hardcoded part
Remove hardcoded part: \\BuildCustomizations. Ya that's more flexible
now.
2016-02-23 22:21:31 +08:00
Samuel Surtees
6753dbe549 Merge pull request #344 from ardneran/master
Added frameworkdirs option.
2016-02-23 20:30:09 +10:00
Samuel Surtees
cd336b08fe Merge pull request #423 from Blizzard/link-groups
Link groups for gcc. (-Wl,--start-group)
2016-02-23 20:21:47 +10:00
Samuel Surtees
a381657629 Merge pull request #428 from tritao/patch-1
Fixed os.outputof to redirect standard streams to capture all output
2016-02-23 20:21:02 +10:00
Samuel Surtees
0b16ef497d Merge pull request #429 from starkos/remove-debug-settings
Remove debug settings from core build scripts
2016-02-23 20:07:02 +10:00
pohan
2eacbe8623 Add Build Customizations option
Support Build Customization settings for projects. Now Premake5 can
recognize Build Customizations File that 3rd party API (e.g. CUDA)
maded.
2016-02-23 11:54:20 +08:00
Jason Perkins
bb90bb44a5 Merge branch 'remove-debug-settings' into release-alpha8 2016-02-22 18:35:17 -05:00
Jason Perkins
c81cfe0eb9 Remove debug settings from core build scripts
These debug settings cause the absolute path to the local premake-core project to be written into the Visual Studio .user file. This isn't a portable path, and shouldn't be generated by the distributed project scripts.
2016-02-22 18:34:15 -05:00
Jason Perkins
6ebd7e1239 Prep for 5.0-alpha8 release 2016-02-19 16:19:49 -05:00
Jason Perkins
0c655706eb Merge branch 'switch-bytecode-flag' into release-alpha8 2016-02-16 18:56:43 -05:00
Samuel Surtees
13d0008a3f Merge pull request #426 from Blizzard/absolute-fix
fix "do_isabsolute", and add more tests.
2016-02-16 20:27:53 +10:00
Samuel Surtees
f225de6295 Merge pull request #427 from starkos/switch-bytecode-flag
Reverse operation of  bytecode embedding flag
2016-02-16 20:25:30 +10:00
João Matos
981007fd4c Fixed os.outputof to redirect standard streams to capture all output. 2016-02-15 16:50:34 +00:00
Jason Perkins
461304c89b Reverse operation of bytecode embedding flag: from --no-bytecode to --bytecode
See [issue #384](https://github.com/premake/premake-core/issues/384) for more information
2016-02-14 19:05:40 -05:00
Tom van Dijck
c98b5eef77 Fix couple of compiler warnings. 2016-02-08 08:59:29 -08:00
Sam Surtees
d382228ceb Converted premake-core tests over to use premake.action.set() instead of _ACTION 2016-02-06 13:35:54 +10:00
Sam Surtees
f60a1b391f path.translate now uses the target OS separator by default instead of Windows separator. 2016-02-06 13:35:03 +10:00
Tom van Dijck
d387209ed4 fix "do_isabsolute", and add more tests. 2016-02-05 13:15:01 -08:00
Tom van Dijck
305430ac11 Merge pull request #422 from Blizzard/log-project-bake
add logging in p.project.bake.
2016-02-05 09:57:23 -08:00
Tom van Dijck
6377a30a6a Link groups for gcc. (-Wl,--start-group) 2016-02-05 09:54:30 -08:00
Tom van Dijck
d0a34c16a9 Merge pull request #421 from Blizzard/os_isfile-fix
Fix do_isfile to support symbolic links on Windows.
2016-02-05 09:46:56 -08:00
Tom van Dijck
90036e0fb4 add logging in p.project.bake. 2016-02-05 09:40:21 -08:00
Tom van Dijck
b6c2b3c712 Fix do_isfile to support symbolic links on Windows. 2016-02-05 09:38:06 -08:00
Samuel Surtees
dd68adaf53 Merge pull request #417 from starkos/update-submodules
Advance submodules to latest revisions
2016-02-02 10:38:37 +10:00