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
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
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
Jason Perkins
7c8fd6175a
Advance submodules to latest revisions
2016-02-01 16:59:23 -05:00
Jason Perkins
834a4e46d2
Merge pull request #376 from Blizzard/makefile-utility-gmake
...
Add utility and makefile type in gmake.
2016-01-26 18:46:29 -05:00
Jason Perkins
deb8a12da1
Merge pull request #409 from starkos/dos-env-vars
...
Add support for DOS-style environment variables, e.g. %JAVA_HOME%
2016-01-22 06:23:05 -05:00
Jason Perkins
ef5ac384cf
Add support for DOS-style environment variables, e.g. %JAVA_HOME%
2016-01-20 14:06:38 -05:00
Jason Perkins
7b2943ffc2
Merge pull request #408 from starkos/msc-character-set-support
...
MSC character set support
2016-01-19 06:10:39 -05:00
Jason Perkins
309ef32ff8
Move character set command line flags from switch lists to defines
2016-01-18 14:11:50 -05:00
Jason Perkins
84cb655069
Add missing Unicode/MBCS defines to MSC command line
...
Note that the defines are showing up in CFLAGS rather than DEFINES. The tool adapter API needs to be modified before they can be placed in the defines list where they should be.
2016-01-18 13:13:37 -05:00
Jason Perkins
5d9c70ed74
Merge pull request #405 from starkos/disable-editorintegration
...
Disable editorintegration() by default
2016-01-18 12:36:57 -05:00
Jason Perkins
57a5a44732
Merge pull request #407 from pra85/2016
...
Update license year range to 2016
2016-01-18 11:42:27 -05:00
Prayag Verma
c41bcc10d7
Happy New Year
2016-01-18 21:39:55 +05:30
Tom van Dijck
642aa2dc20
Merge pull request #406 from tvandijck/readme-update
...
Readme update
2016-01-17 14:27:16 -08:00
Tom van Dijck
259dcdff69
Update README.md
2016-01-17 14:22:59 -08:00
Tom van Dijck
1068d0a6ba
Merge pull request #404 from tvandijck/fix-nmake-vs2015
...
add macro to bootstrap to override the visual studio version.
2016-01-17 13:47:43 -08:00