Commit Graph

3148 Commits

Author SHA1 Message Date
Tom van Dijck
431cba5c6a Gmake elseif (#161)
* gmake2 elseif pattern for configurations.
https://ghosthub.corp.blizzard.net/premake/premake-core/issues/131

* fix error message.

* don't output else if there is no if statements.
2017-11-30 09:33:55 -08:00
Tom van Dijck
0b4659cf1e makeUnique only for internal rules, not for all rules. 2017-11-30 09:33:42 -08:00
Tom van Dijck
6800af3342 fix buildoutput sequencing. 2017-11-30 09:33:31 -08:00
Tom van Dijck
bc375f7fe7 fix context.addFilter 2017-11-30 09:31:10 -08:00
Tom van Dijck
5a0b07cd45
Merge pull request #926 from Blizzard/translateCommandsAndPaths-fixes
Fixes translateCommandsAndPaths, and debugargs.
2017-11-30 09:25:58 -08:00
Tom van Dijck
bf4c71e8ba Fixes translateCommandsAndPaths, and debugargs. 2017-11-30 09:25:11 -08:00
Tom van Dijck
c7f0080a80 fix gmake2 utility outputting an entire set of elements. 2017-11-30 09:14:37 -08:00
Tom van Dijck
d2080dbd76
Merge pull request #944 from premake/Cpp0x
C++0x dialect support
2017-11-30 08:54:32 -08:00
Manu Evans
78a17435ca C++0x (and friends) dialect support. Useful on machines with old compilers. 2017-11-29 14:15:25 -08:00
Tom van Dijck
1279e6baf6
Merge pull request #950 from LORgames/ssurtees/gmakeDefaultPlatform
Added defaultplatform support to gmake and gmake2 actions
2017-11-29 12:14:30 -08:00
Tom van Dijck
0a61717399
Merge pull request #938 from premake/staticruntime
Added `staticruntime` API. (#163)
2017-11-29 12:13:07 -08:00
Tom van Dijck
a3c80ae238
Merge pull request #939 from premake/resolve_rule_props
Resolve the rule properties for gmake (#162)
2017-11-29 12:12:27 -08:00
Tom van Dijck
e1ece5672e
Merge pull request #941 from premake/pch_tabs
Fix makefile PCH tab problem
2017-11-29 12:11:57 -08:00
Tom van Dijck
ebbab7b452
Merge pull request #948 from Gereld/gmake2_clang_pch
Fixed a bug in gmake2 with clang and pch.
2017-11-29 12:11:40 -08:00
Tom van Dijck
9b55b587de
Merge branch 'master' into ssurtees/gmakeDefaultPlatform 2017-11-29 12:11:07 -08:00
Tom van Dijck
e768d4ab40
Merge pull request #949 from LORgames/ssurtees/DPIAwareness
Added DPI awareness support to VS2010+ projects
2017-11-28 09:23:27 -08:00
tempura-sukiyaki
1c65a141b0 Add support for targetextension in xcode4 2017-11-29 00:44:00 +09:00
Sam Surtees
de03bb3249 Added defaultplatform support to gmake and gmake2 actions 2017-11-24 00:07:26 +10:00
Sam Surtees
d125d520e6 Added DPI awareness support to VS2010+ projects 2017-11-23 22:58:03 +10:00
Tom van Dijck
4ef3fff58c Fix for external files when using absolute paths on windows. 2017-11-14 10:16:12 -08:00
Unknown
3bf3f791be Fixed a bug in gmake2 with clang and pch.
Clang requires the pch file to be the first force-included item. This fix doesn't break pch usage in gcc.
2017-11-12 20:59:51 +01:00
Samuel Surtees
96a020c532
Merge pull request #945 from premake/natvis
Natvis files have an item group.
2017-11-10 13:56:32 +10:00
Manu Evans
16bf40dd00 Natvis files have an item group. 2017-11-09 14:44:06 -08:00
Manu Evans
0ebb85ba87 Fix makefile PCH tab problem 2017-11-06 18:00:54 -08:00
Manu Evans
861003a8ca Resolve the rule properties for gmake (#162) 2017-11-01 13:57:29 -07:00
Manu Evans
2de9966995 Added staticruntime API. (#163) 2017-11-01 13:55:21 -07:00
Tom van Dijck
ed6f8a47fc Merge pull request #12 from premake/linking
Add linking support for externally referenced files.
2017-11-01 12:52:48 -07:00
Tom van Dijck
0b479a50f5 Add linking support for externally referenced files. 2017-11-01 12:51:35 -07:00
Tom van Dijck
66362c08c0 Merge pull request #931 from CreativeAssembly/master
Added synchronous and C-Throw to VS projects.
2017-10-19 08:44:11 -07:00
J. Perkins
3222e3b2ca Merge pull request #932 from pjohalloran/os_copyfile_windows_fix
Added extra information for Windows platform when copyfile fails.
2017-10-19 11:02:39 -04:00
PJ O Halloran
83c9cc03f5 Added extra information for Windows platform when copyfile fails. 2017-10-18 22:32:01 +01:00
J Guy Davidson
26558d1597 Merge branch 'master' into master 2017-10-18 08:16:41 +01:00
Tom van Dijck
378c074424 Merge pull request #927 from Blizzard/test-detoken-bug
bug fix for recursive token expansion
2017-10-17 08:38:13 -07:00
Guy Davidson
c80ea34fb4 Withdraw explicit "Default" option for exception handling 2017-10-17 16:24:00 +01:00
Tom van Dijck
9517fd54b8 Merge pull request #928 from Blizzard/fix-test_configset
sometimes due to ordering of test, we're in a rule scope.
2017-10-17 08:00:46 -07:00
Guy Davidson
270cbc0365 Completed exception handling
Added synchronous and C-Throw to VS projects.
2017-10-17 12:27:09 +01:00
Tom van Dijck
3f0aa55e8b sometimes due to ordering of test, we're in a rule scope, which makes settings some of the values into configsets illegal.
So we just force ourselves into a project scope.
2017-10-16 16:43:02 -07:00
Tom van Dijck
bf8f711425 bug fix for recursive token expansion
added test in gmake2.
2017-10-16 16:38:32 -07:00
Tom van Dijck
0ee416a37c Merge pull request #922 from Blizzard/gmake2-pch-fix
gmake2 bug fix.  When generating gmake file with pch headers
2017-10-16 11:28:32 -07:00
Tom van Dijck
3708b49d54 Merge pull request #923 from Blizzard/arm64
Add Visual Studio ARM64 support.
2017-10-16 11:25:09 -07:00
jmears
cfff6870bf Add Visual Studio ARM64 support. I verified that this actually works with ARM64 Visual Studio. 2017-10-13 09:13:54 -07:00
R. Blaine Whittle
9be911390d gmake2 bug fix. When generating gmake file with pch headers
for either gcc or clang, the generated
make files assumed the system had the touch command.
Which isn't true by default on windows.
2017-10-13 09:12:03 -07:00
Tom van Dijck
a15c465d63 Merge pull request #921 from Blizzard/compiler-warnings
Compiler warnings
2017-10-13 09:08:34 -07:00
Tom van Dijck
5a0e2c8cb1 Merge pull request #920 from Blizzard/selftest-fix
small fix in self-test module.
2017-10-13 09:08:00 -07:00
Tom van Dijck
d4a95ae606 Merge pull request #919 from Blizzard/gmake2-perfile_flags-test
Add perfile flags test for gmake backend.
2017-10-13 09:07:45 -07:00
J Guy Davidson
922440da94 MASM preprocessor definitions (#917)
* MASM preprocessor definitions
2017-10-13 09:06:57 -07:00
jmears
f1b9aecab3 lua_error is a noreturn function. 2017-10-12 16:11:06 -07:00
jmears
a0ef053b08 Unused parameter warning fix. 2017-10-12 16:10:54 -07:00
Tom van Dijck
a93fb478cf small fix in self-test module. 2017-10-12 16:09:49 -07:00
Tom van Dijck
9da8888af0 Add perfile flags test for gmake backend. 2017-10-12 16:08:58 -07:00