Commit Graph

3546 Commits

Author SHA1 Message Date
starkos
ecaebbad06 Fix #1411: Remove "|" from Codelite config names 2020-03-30 15:57:52 -04:00
Samuel Surtees
c4f36032cc
Merge pull request #1415 from englercj/c++-ext-support
Add .c++ extension support to a few spots it was missing
2020-03-28 18:55:42 +10:00
Chad Engler
92888e8c33 Add .c++ to a few spots it was missing 2020-03-27 18:50:41 -07:00
starkos
5b2f92c9ce
Merge pull request #1404 from Mikhael-Danilov/master
Place all generated files in separate GENERATED list, so they all can…
2020-03-22 13:09:09 -04:00
Mikhael Danilov
7c0c02acfd Place all generated files in separate GENERATED list, so they all can be cleaned by clean target. 2020-03-17 22:21:13 +03:00
starkos
6ca121993b
Merge pull request #1403 from redorav/master
Add build steps to Visual Studio
2020-03-05 18:50:50 -05:00
redorav
8c985b253a
Merge branch 'master' into master 2020-02-27 19:47:35 +00:00
Emilio López
4ca4a1d0a0 Add build steps to Visual Studio 2020-02-27 19:45:56 +00:00
Samuel Surtees
24458c6a25
Merge pull request #1406 from starkos/fix-deferred-join-delimiter
Change deferred join delimiter to non-printable character
2020-02-26 19:06:36 +10:00
tempura-sukiyaki
40e3fbf5ea Change deferred join delimiter to non-printable character
This is a squashed and rebased version of #1384, authored by @tempura-sukiyaki. Changes the deferred join path delimiter to a non-printable character to avoid conflicts with the pipe symbol in paths.
2020-02-25 18:53:26 -05:00
Samuel Surtees
0a9844891d
Merge pull request #1402 from yuyoyuppe/fix_1172
Remove checkFunc from Resource files
2020-02-18 23:12:34 +10:00
yuyoyuppe
374618b908
Remove checkFunc from Resource files 2020-02-18 14:29:37 +03:00
Samuel Surtees
789c0ac343
Merge pull request #1401 from starkos/fix-pr-1013
Remove commands optimization which breaks tokens
2020-02-14 16:58:49 +10:00
starkos
ed92aba9c2 Remove commands optimization which breaks tokens
When a build command contains a token which references a configuration, ex. `{cfg.platform}`, the platform optimizations removed by this commit would cause a crash: "Attempt to index a nil value (global 'cfg')".

Fixes #1013
2020-02-13 20:04:24 -05:00
starkos
80b8c1fedf
Merge pull request #1396 from LORgames/ssurtees/linkgroupsFix
Fixed bug with linkgroups only working on Premake projects
2020-02-12 20:28:50 -05:00
Sam Surtees
f8a88c362c Fixed bug with linkgroups only working on Premake projects 2020-02-09 01:10:07 +10:00
Samuel Surtees
a640f86d5b
Merge pull request #1395 from LORgames/ssurtees/normalizeFix
Fixed edge case in path.normalize
2020-02-04 22:45:01 +10:00
Sam Surtees
9128498bf9 Fixed edge case in path.normalize 2020-02-02 16:30:44 +10:00
starkos
63a1e5ff3b
Merge pull request #1386 from ClxS/netcore_publish
Initial support for generating netcore and netstandard projects
2020-01-08 21:00:56 -05:00
Carl
53accacd3e
Merge branch 'master' into netcore_publish 2020-01-08 10:46:06 +00:00
Samuel Surtees
237258b096
Merge pull request #1385 from tempura-sukiyaki/fix-pull-request-template
Fix pull request template
2020-01-07 15:40:01 +10:00
Carl
148bd00268 Fixed test failures 2020-01-05 20:25:40 +00:00
Carl
33e5be812c
Initial netcore support (#2) 2020-01-05 19:59:51 +00:00
tempura-sukiyaki
07cf24caf1 Fix pull request template 2020-01-06 04:27:42 +09:00
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