Commit Graph

3522 Commits

Author SHA1 Message Date
Samuel Surtees
09ee833493
Merge pull request #1362 from LORgames/ssurtees/androidTestFix
Fixed inconsistencies in Android VS project test
2019-11-16 16:02:45 +10:00
@starkos
cd6fa6a0ab
Merge pull request #1365 from r-a-sattarov/master
E2K: fixed build by MCST lcc compiler
2019-11-15 10:15:46 -05:00
r-a-sattarov
2d7de21634
Merge branch 'master' into master 2019-11-10 17:55:06 +03:00
Samuel Surtees
fe962f898c
Merge pull request #1360 from sp-jordi-vilalta/feature/fix-os-return
Fix the return value of some os functions
2019-11-11 00:07:15 +10:00
r-a-sattarov
907c83d840 E2K: fixed build by MCST lcc compiler
- fixed build by MCST lcc compiler on MCST Elbrus 2000 architecture when using Curl
- strip UTF-8 BOM for compability with MCST lcc compiler < 1.24
2019-11-10 14:31:01 +03:00
@starkos
af3509fbef
Merge pull request #1361 from LORgames/ssurtees/simplifyTest
Simplified unit test to resolve path issues
2019-11-08 10:06:21 -05:00
Sam Surtees
448fb5c697 Fixed inconsistencies in Android VS project test 2019-11-07 02:34:38 +10:00
Sam Surtees
b976d2f178 Simplified unit test to resolve path issues 2019-11-07 00:53:52 +10:00
Jordi Vilalta Prat
f76aa6812e
Merge branch 'master' into feature/fix-os-return 2019-11-04 11:25:23 +01:00
@starkos
bd70a11d1c
Merge pull request #1359 from tbasnoopy/master
Add assemblyDebug for vs2017
2019-11-01 08:52:45 -04:00
Jordi Vilalta Prat
75ceeb50c6 Fix the return values of os.rmdir() and os.remove() 2019-10-31 18:11:25 +01:00
Skibbe
785c8452ee add assemblyDebug 2019-10-31 13:24:29 +01:00
Jordi Vilalta Prat
55abe47caf Fix a few copy-pasted comments 2019-10-31 12:38:18 +01:00
@starkos
b96bc35ba1
Merge pull request #1357 from starkos/deprecate-debuggerflavor
Replace debuggerflavor with debugger (take #2)
2019-10-23 17:16:09 -04:00
starkos
bffce3e4cb Fix failing gmake2 unit test 2019-10-21 21:27:55 -04:00
@starkos
3da7869498
Merge pull request #1358 from zlnimda/master
Added support for Dx11.3 shader model
2019-10-21 16:07:47 -04:00
@starkos
448b5cb3ee
Merge pull request #1229 from LORgames/ssurtees/gmake2Fix
Generated makefiles no longer error when a configuration can be missing
2019-10-21 16:05:57 -04:00
Alexandre Boulet
95504b1c65 Added support for Dx11.3 shader model 2019-10-21 19:17:39 +02:00
starkos
da8054146f Replace debuggerflavor with debugger (take #2) 2019-10-21 11:47:07 -04:00
Samuel Surtees
c4e2dca65f
Merge pull request #1356 from starkos/xcodebuildresources-patterns
Allow wildcards in xcodebuildresources
2019-10-21 22:19:14 +10:00
starkos
1692363fd9 Allow wildcards in xcodebuildresources 2019-10-21 07:20:06 -04:00
Samuel Surtees
0987dcdec8
Merge pull request #1355 from starkos/shaderincludedirs2
Add shaderincludedirs to fxcompile configuration
2019-10-21 11:18:56 +10:00
arcturus
983333eab3 Add shaderincludedirs to fxcompile configuration 2019-10-20 15:54:31 -04:00
@starkos
00052e182d
Merge pull request #1353 from fountainment/master
Fix premake4.lua bootstrap build script
2019-10-17 10:10:21 -04:00
C.Even
bcbe25545e Fix premake4.lua bootstrap build script 2019-10-17 02:22:50 +08:00
@starkos
3f0cf0b5c0
Merge pull request #1345 from kaldap/registry
New 'listWindowsRegistry' OS API method for enumerating content of single registry subkey
2019-10-14 16:01:14 -04:00
@starkos
c3a044ff1d
Merge pull request #1192 from dsvi/dsvi-patch-1
Update path.lua
2019-10-14 15:45:46 -04:00
Petr Kalandra
95fb306b2b New 'listWindowsRegistry' OS API method for enumerating content of single Windows registry subkey 2019-10-14 21:35:13 +02:00
@starkos
b02c495d02
Merge pull request #1352 from LORgames/ssurtees/testImprovement
Improved test runner usage
2019-10-13 12:56:57 -04:00
Sam Surtees
c85e8203d0 Improved test runner usage 2019-10-14 02:36:31 +10:00
@starkos
96a14c005a
Merge pull request #1351 from LORgames/ssurtees/vcxitems
Added support for vcxitems project generation for VS2013+
2019-10-13 12:08:32 -04:00
Sam Surtees
256e176eb1 Added support for vcxitems project generation for VS2013+ 2019-10-14 01:13:59 +10:00
@starkos
b5471154a6 Update issue templates 2019-10-09 10:19:04 -04:00
@starkos
f1bf795088 Fix feature request title and description 2019-10-09 10:18:00 -04:00
@starkos
ad89dfcb0d
Merge pull request #1342 from premake/improve-bug-template
Improve bug reporting template
2019-10-08 10:28:44 -04:00
@starkos
0d86d31776
Merge pull request #1343 from premake/improve-feature-template
Improve feature request template
2019-10-08 10:28:28 -04:00
@starkos
e70ba99c4a
Merge pull request #1341 from premake/get-help-issue-template
Add new issue template "Get help"
2019-10-08 10:27:45 -04:00
@starkos
675f22cc32 Improve feature request template
- Add more examples and instructions
- Attach "enhancement label"
- Match tense of other templates
2019-10-08 10:03:27 -04:00
@starkos
398dff5a80 Improve bug reporting template
- Provide examples
- Link article on code block formatting
- Add "bug" label
- Make it a little more friendly
2019-10-08 09:52:50 -04:00
@starkos
b4191ca1f6 Add new issue template 2019-10-08 09:44:56 -04:00
@starkos
e59da0882e Add new issue template "Get help"
Add a new issue template for folks who just need help using Premake, and who aren't trying to log a bug or request a feature.
2019-10-08 09:36:21 -04:00
Samuel Surtees
1a8bd062c3
Merge pull request #1340 from jp31415926/upgrade-lua
Upgrade Lua from 5.3.4 to 5.3.5
2019-10-08 00:53:46 +10:00
John Price
4676139abb Upgrade Lua from 5.3.4 to 5.3.5 2019-10-06 13:09:55 -05:00
Samuel Surtees
38c29d7533
Merge pull request #1289 from mmuman/haiku-fixes
Haiku fixes
2019-10-01 22:31:17 +10:00
François Revol
fd8bfef352 Fix Haiku support
- contrib/curl: use linux config for Haiku
Like svr4 we don't have SIOCGIFADDR.

- Haiku is POSIX enough

- Add libs for Haiku
Not tested yet

- contrib: fix Haiku bootstrap

- Fix os.getversion() for Haiku

- Fix bootstrap on Haiku
2019-10-01 00:48:56 +02:00
Samuel Surtees
e5e4f382e2
Merge pull request #1337 from baconpaul/macosx-deployment-1336
On OSX, convert systemversion to MACOSX_DEPLOYMENT_TARGET
2019-09-22 22:23:56 +10:00
Paul
73805ea2db On OSX, convert systemversion to MACOSX_DEPLOYMENT_TARGET
Per the discussion in issue #1336, if systemversion is set
output MACOSX_DEPLOYMENT_TARGET into the resulting xcode project.
This borrows a diff from the (unmerged) PR #1003, applies it
in isolation, and adds a pair of unit tests to confirm that both
setting and not setting the systemversion results in correct
output.

Closes #1336
2019-09-22 08:06:19 -04:00
Samuel Surtees
49175231fe
Merge pull request #1334 from ratzlaff/vc2008_compileas
Implement 'compileas' for vc2008
2019-09-15 22:41:18 +10:00
Ben Ratzlaff
ebbc6de2d8 Implement 'compileas' for vc2008 2019-09-13 21:05:49 -07:00
Samuel Surtees
d0377b99f9
Merge pull request #1333 from ratzlaff/case_collision_cleanup
Cleanup related to #1332
2019-09-13 17:03:27 +10:00