Commit Graph

3673 Commits

Author SHA1 Message Date
Samuel Surtees
d0377b99f9
Merge pull request #1333 from ratzlaff/case_collision_cleanup
Cleanup related to #1332
2019-09-13 17:03:27 +10:00
Ben Ratzlaff
25a580fbed Cleanup the flow control of PR #1332 2019-09-12 21:14:47 -07:00
Samuel Surtees
53e4f81312
Merge pull request #1332 from ratzlaff/fix_case_insensitive_collisions
Account for filename collisions on systems with case-insensitive file…
2019-09-12 15:57:41 +10:00
Ben Ratzlaff
5142230999 Account for filename collisions on systems with case-insensitive file systems 2019-09-11 22:39:07 -07:00
Samuel Surtees
a9f04f3048
Merge pull request #1327 from premake/feature/pr-template
Add a pull request template
2019-08-30 01:25:35 +10:00
starkos
c5679d4ecc Add a pull request template 2019-08-29 10:22:31 -04:00
Samuel Surtees
e61480245f
Merge pull request #1326 from premake/issue-templates
Update issue templates
2019-08-29 18:54:00 +10:00
@starkos
d7e670afc9 Update issue templates 2019-08-28 16:27:00 -04:00
@starkos
64af84deb7
Merge pull request #1325 from starkos/update-readme
Improve the README
2019-08-27 11:29:02 -04:00
starkos
9a351cc745 Improve the README 2019-08-27 11:12:14 -04:00
@starkos
376426d411
Merge pull request #1324 from starkos/contributing-page
Add a CONTRIBUTING.md
2019-08-21 11:11:19 -04:00
starkos
37c2e23e2e Add a CONTRIBUTING.md 2019-08-21 10:00:48 -04:00
@starkos
4546e23b7d
Merge pull request #1323 from starkos/update-copyrights
Update copyright year in support files
2019-08-20 10:30:21 -04:00
starkos
107a3c5e78 Update copyright year in support files 2019-08-20 10:05:37 -04:00
Samuel Surtees
367b9822c0
Merge pull request #1316 from starkos/feature/funding
Add FUNDING.yml for GitHub Sponsors
2019-07-24 11:27:05 +10:00
@starkos
dc0dac5506
Merge branch 'master' into feature/funding 2019-07-23 11:35:34 -04:00
starkos
7be8e9a6ba Add FUNDING.yml for GitHub Sponsors 2019-07-23 11:33:36 -04:00
Samuel Surtees
62420d4713
Merge pull request #1318 from LORgames/pfox/gnustl
Updated mismatched android config to the value in the allowed stl table
2019-07-23 22:04:35 +10:00
Paul Fox
5fbd357d3a Updated mismatched android config to the value in the allowed stl table 2019-07-23 21:47:43 +10:00
@starkos
d2dcf707ac
Merge pull request #1313 from opencollective/opencollective
Activating Open Collective
2019-07-22 07:23:22 -04:00
Jess
b2a50101d6 Added financial contributors to the README 2019-07-15 06:17:53 -07:00
Samuel Surtees
94f6d63d4c
Merge pull request #1305 from cfs-pure/patch-1
Reconcile logic within os_matchisfile()
2019-06-30 22:25:45 +10:00
cfs-pure
7d910ad5bc
Reconcile logic within os_matchisfile()
If dirent supplies d_type, then match the logic used within do_isfile() to determine if a directory entry is a file or not.
2019-06-27 15:50:21 -07:00
Samuel Surtees
900e4b0d86
Merge pull request #1285 from ifarbod/vs16-compat-android
Use correct values for MinimumVisualStudioVersion in Android projects
2019-06-08 08:34:30 +10:00
iFarbod
9506f1aae4
Test against VS15 and VS16 as pointed out by @samsinsane 2019-06-07 22:14:15 +04:30
Samuel Surtees
b173d0890a
Merge pull request #1296 from tdesveauxPKFX/package-source-fix
Fix source packaging
2019-06-07 16:36:36 +10:00
Samuel Surtees
f930e7095c
Merge pull request #1275 from LORgames/ssurtees/codeliteFixes
Fixed various issues with escaping in CodeLite generator
2019-06-07 13:54:45 +10:00
@starkos
d561c80ed4
Merge pull request #1298 from TurkeyMan/d_updates
Update D module to VS2019 and latest D compiler options.
2019-06-03 17:21:02 -04:00
Manu Evans
f7416857a1 Update D module to VS2019 and latest D compiler options. 2019-06-02 03:10:41 -07:00
tdesveaux
e4d8121f9c package.lua: Fix source package not containing scripts.c 2019-05-30 19:10:28 +02:00
tdesveaux
465e35e14d package.lua: do not use gitattributes export-ignore as it's used by github package as well 2019-05-30 19:10:03 +02:00
iFarbod
5f0b1ce005
Fix android test case for minVSversion 2019-05-24 16:07:21 +04:30
iFarbod
836cbfa96d
Use correct values for MinimumVisualStudioVersion in Android projects 2019-05-08 19:10:14 +04:30
Samuel Surtees
82bcf8b676
Merge pull request #1282 from ifarbod/fix-vs2019-icon
Fix VS2019 solution icons
2019-05-08 12:15:40 +10:00
iFarbod
7c5fd94601
Fix VS2019 solution icons 2019-05-07 20:11:05 +04:30
Samuel Surtees
d7c27fdbe8
Merge pull request #1281 from tdesveauxPKFX/package/source_improvements
Source package improvements
2019-05-06 00:26:09 +10:00
Samuel Surtees
932ecae300
Merge pull request #1280 from tdesveauxPKFX/bootstrap_latest_vs
Bootstrap.bat: Default to latest Visual Studio available
2019-05-06 00:24:05 +10:00
Samuel Surtees
1029d1e2ce
Merge pull request #1279 from premake/release-5.0-alpha14
Release 5.0 alpha14
2019-05-06 00:19:36 +10:00
Thomas Desveaux
cf290de504 Package: Add xcode and codelite projects to source package 2019-05-04 17:22:56 +02:00
Thomas Desveaux
625e6d40e6 Bootstrap: Use gmake2 instead of gmake 2019-05-04 17:17:19 +02:00
Thomas Desveaux
552c00cbd8 Package: Replace gmake with gmake2 for source package 2019-05-04 17:16:52 +02:00
Thomas Desveaux
9ac4db937c Post Alpha14 release: Set PREMAKE_VERSION to dev 2019-05-04 16:56:10 +02:00
Thomas Desveaux
f1dbf78e25 README: Update commit since last release shield for alpha14 2019-05-04 16:29:03 +02:00
Thomas Desveaux
fe78c5689e Package.lua: Minor fix to premakeBin value 2019-05-04 16:03:07 +02:00
Thomas Desveaux
830e13f06c Bootstrap.bat: Change default behaviour to bootstrap with latest Visual Studio available 2019-05-04 15:30:15 +02:00
Thomas Desveaux
e8288a7260 CHANGES.txt: Add merged PRs since alpha13 2019-05-04 14:21:32 +02:00
Thomas Desveaux
ff368fcceb Bump PREMAKE_VERSION to alpha14 2019-05-04 14:09:44 +02:00
Thomas Desveaux
ca50a00bdf
Merge pull request #1278 from tdesveauxPKFX/redist_improvement
Packaging script improvement
2019-05-04 14:07:13 +02:00
Thomas Desveaux
d413f5c360 Bootstrap.mak: Add macosx alias for osx to match Premake os.host() 2019-05-03 17:35:04 +02:00
Thomas Desveaux
898fe7b599 Package: Use Premake action list to generate projects for source package 2019-05-03 17:33:13 +02:00