Commit Graph

2490 Commits

Author SHA1 Message Date
aleksijuvani
ee521c4c57 Add tests for Visual Studio NuGet support 2016-03-19 20:43:38 +02:00
aleksijuvani
987818a9e7 Add NuGet support to the Visual Studio exporter 2016-03-19 20:43:37 +02:00
Jason Perkins
5bbc06f4b6 Merge pull request #451 from Blizzard/fix-path-translate
fix path_translate for old compilers.
2016-03-17 18:16:46 -04:00
Tom van Dijck
0047780b3b fix path_translate for old compilers. 2016-03-17 14:24:00 -07:00
Jason Perkins
dbb42a0b77 Merge pull request #307 from LORgames/ssurtees/translatePathFix
Modify `path.translate()` to use target OS path separator by default
2016-03-17 12:13:55 -04:00
Jason Perkins
ab627efe93 Merge pull request #449 from starkos/restore-vs-link-markup
Roll back PR #440
2016-03-16 16:34:00 -04:00
Jason Perkins
ef2f5c8945 Roll back PR #440; see discussion at https://github.com/premake/premake-core/pull/440 2016-03-15 14:48:33 -04:00
Samuel Surtees
c7bae391c7 Merge pull request #396 from tvandijck/fix-global-scope
Fix the oven to store the global container in the project and configs.
2016-03-08 21:45:36 +10:00
Samuel Surtees
495befbd7e Merge pull request #443 from starkos/isabsolute-allow-dot
Allow dot in path variables
2016-03-08 21:13:01 +10:00
Samuel Surtees
5421352255 Merge pull request #444 from starkos/fix-clang-getlinks
Fix mis-cased symbol in clang.getlinks()
2016-03-08 21:12:28 +10:00
Jason Perkins
150aed7bbb Fix mis-cased symbol in clang.getlinks() 2016-03-07 16:41:48 -05:00
Jason Perkins
5c3f2b8835 Some environments and toolsets allow additional characters within $(...) tokens. Adding the dot "." 2016-03-07 16:38:50 -05:00
Tom van Dijck
9324eb47fa fix global bake 2016-03-06 16:57:49 -08:00
Tom van Dijck
3c5ba0a6da Fix the baking process for 'global'. 2016-03-06 16:38:00 -08:00
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