Commit Graph

2419 Commits

Author SHA1 Message Date
Thomas Desveaux
e7721ba149 Post-release: Set PREMAKE_VERSION to dev 2018-10-22 13:49:27 +02:00
Thomas Desveaux
0818876332 Options: Set compilers category for cc, dc and dotnet 2018-10-22 13:44:07 +02:00
Thomas Desveaux
a37b45ec01 showhelp: sort options allowed values 2018-10-22 13:43:59 +02:00
Thomas Desveaux
9a094b1a6b Update Copyright to 2018 2018-10-22 13:43:52 +02:00
tdesveaux
4828250a5f Bump PREMAKE_VERSION to alpha13 2018-10-22 13:43:45 +02:00
Samuel Surtees
5354556d99
Merge pull request #1180 from tempura-sukiyaki/xcode4-os-ios
Add `os.ios` option in xcode4
2018-10-18 22:51:51 +10:00
tempura-sukiyaki
7e498376ac fix system comparison macOS and iOS 2018-10-18 21:42:41 +09:00
tempura-sukiyaki
d269416923 fix options.os and os.systemTags for ios suppot 2018-10-18 21:13:56 +09:00
Samuel Surtees
9e66ec94fc
Merge pull request #1160 from WorldofBay/patch-2
use ';' as default separator for vs
2018-10-18 20:42:01 +10:00
WorldofBay
8c5e4e18ad use ';' as default separator for vs 2018-10-18 11:59:00 +02:00
tempura-sukiyaki
5cffdc4f6b Add os.ios option in xcode4 2018-10-18 18:52:35 +09:00
Cengiz Can
290f3f2494 use hex value for shim index key 2018-10-16 08:37:27 +03:00
Cengiz Can
eea2de2a1a Avoid impl dependent multi-char constants
Hello!

I was receiving this warning while compiling for linux:

```
src/host/premake.c: In function ‘premake_init’:
src/host/premake.c:197:36: warning: multi-character character constant [-Wmultichar]
  lua_rawseti(L, LUA_REGISTRYINDEX, 'SHIM');
                                    ^~~~~~
```

Instead of disabling the warning, I've decided to convert that array key to
an expression.

And I've tested with following compilers:

gcc version 7.3.0 (Ubuntu 7.3.0-27ubuntu1~18.04)
gcc version 6.3.0 20170516 (Debian 6.3.0-18+deb9u1)

Thank you
2018-10-15 11:55:05 +03:00
Thomas Desveaux
f68c386341 path.normalize: Fix when call with path surrounded with quotes 2018-10-11 14:21:42 +02:00
Samuel Surtees
dfef8e4766
Merge pull request #1132 from tdesveauxPKFX/host/normalize
Refactor path.normalize and handle path ending with .
2018-08-13 20:30:02 +10:00
tdesveaux
6298b1516e Host: Refactor path normalize 2018-08-12 15:08:13 +02:00
Samuel Surtees
8e02eac4e4
Merge pull request #1142 from Blizzard/csver
Support for CSDialect
2018-08-10 14:59:50 +10:00
tempura-sukiyaki
40d48e11cc Fix indent 2018-08-01 13:56:55 +09:00
tempura-sukiyaki
ea4f03c4cd Fix OSXFramework bundlepath 2018-08-01 12:28:32 +09:00
tempura-sukiyaki
3f1f44eca8 Add sharedlibtype in xcode4 2018-07-31 20:52:59 +09:00
thwatson
e152b8ba85 Support for CSDialect 2018-07-27 11:49:58 -07:00
Sebastian Kylander
3fec411a54
Merge branch 'master' into server-paths 2018-07-18 16:37:19 +02:00
Sebastian Kylander
7089044a4c Support server paths in various path functions 2018-07-17 23:41:14 +02:00
Jason Jurecka
ccbdc2aae4 Swap order of applying project specific config
the config needs to be resolved based on the isolated config|platform pair

The issue this is solving is that anything that changes "system" as part of the
config|platform pair would not be applied to resolve of per file config due to
prj.system being a table that contains the current os system and when the order
of application was in the original order the project pair settings would be
overriden by the generic prj settings which are set as defaults in other locations
2018-06-28 11:45:58 -07:00
Samuel Surtees
30ab624182
Merge pull request #1115 from redorav/remove_xbox360
Remove Xbox 360 code from core to move and expand onto a standalone module
2018-06-14 22:26:36 +10:00
Emilio López
1cb240dbe5 Remove Xbox 360 code from core to move and expand onto a standalone module 2018-06-08 22:55:59 +01:00
Manu Evans
6a78127370 Support buildaction for C++ projects. 2018-06-07 13:22:41 -07:00
Erin Catto
6da758cdd7 Xcode Fixes
Fix cppdialect=C++11
Fix angle bracket include complaints
2018-05-31 21:00:15 -07:00
Tom van Dijck
f040a9298a cache results of shouldUseColors() 2018-05-08 12:35:24 +02:00
Tom van Dijck
f8c7edf20d
Merge pull request #1077 from lanurmi/no-colors-on-non-tty
Do not output colors e.g. into a pipe, unless forced.
2018-05-08 12:19:56 +02:00
Tom van Dijck
a493421c0c
Merge pull request #1049 from tdesveauxPKFX/visibility-inlines-hidden
Add InlinesVisibility API
2018-05-07 10:19:27 +02:00
Lauri Nurmi
c04d44149a Also support the CLICOLOR variable on Windows.
Colors probably cannot be forced on though, because of different implementation on Windows.
2018-05-04 14:21:12 +03:00
Lauri Nurmi
ba34e3e28a Do not output colors e.g. into a pipe, unless forced.
Use the de-factoish environment variables CLICOLOR(_FORCE) to override default color behavior.
2018-05-02 15:49:15 +03:00
Jörn Heusipp
2e7ca5fb18 Add C++17 support for Visual Studio 2017.
This also adds support for 'cppdialect "C++latest"'.
2018-04-30 17:35:01 +02:00
Ben Ratzlaff
5519acbeb8 Use fputs when changing the terminal color 2018-04-30 17:32:40 +02:00
Samuel Surtees
53c435208b
Merge pull request #1070 from lanurmi/fix-openbsd-depends-on-1068
Support successfully bootstrapping on OpenBSD.
2018-04-27 00:12:52 +10:00
Lauri Nurmi
e71a99d0a1 Support successfully bootstrapping on OpenBSD. 2018-04-26 16:39:33 +03:00
Lauri Nurmi
6fe0b64f6b Fix constructing executable path from argv[0].
Do not leave unwanted stuff in the stack in premake_locate_executable(), as the caller only expects exactly one string to be pushed.
2018-04-25 23:23:01 +03:00
Lauri Nurmi
3556135a56 Fix logic for absolute/relative argv[0] when constructing executable path.
Do not call path_isabsolute() in condition -- it always returns 1 and modifies the stack.
If argv[0] is already absolute, push it in the stack alone.
2018-04-25 23:07:37 +03:00
Tom van Dijck
8c4cf353b5 fix a few compiler warnings. 2018-04-21 12:21:47 +02:00
Tom van Dijck
267e67d90f Tiny gcc fix from PR #506. 2018-04-21 11:17:15 +02:00
thomas desveaux
259f11846b Add inlinesvisibility API + implement for gcc 2018-04-18 14:15:08 +02:00
Thomas Desveaux
aff871abfc Merge remote-tracking branch 'origin/master' into visibility-hidden 2018-04-17 14:46:11 +02:00
Samuel Surtees
2061b151b9
Merge pull request #1043 from tdesveauxPKFX/omit-frame-pointer
Add omitframepointer API
2018-04-17 20:19:36 +10:00
Thomas Desveaux
4d8ba3d086 Merge remote-tracking branch 'origin/master' into visibility-hidden 2018-04-17 11:58:27 +02:00
thomas desveaux
9eb81bd228 Update msc tools to new omitframepointer API 2018-04-15 18:13:56 +02:00
thomas desveaux
c629c4a1c1 Merge remote-tracking branch 'origin/master' into omit-frame-pointer 2018-04-15 17:56:41 +02:00
redorav
9f1b32fa23
Merge branch 'master' into systemversion 2018-04-14 11:23:44 +01:00
Thomas Desveaux
a8ad766612 Remove no longer used table.joinunique 2018-04-13 19:06:36 +02:00
thomas desveaux
22e36f97b8 Better performance on fix issue #884 2018-04-12 23:40:16 +02:00
thomas desveaux
15829d5967 Merge remote-tracking branch 'premake/master' into fix-mergeFilters 2018-04-12 23:34:25 +02:00
redorav
e8e23a16e6
Merge branch 'master' into systemversion 2018-04-12 21:10:08 +01:00
thomas desveaux
00aa3a8582 Fix deprecation of NoFramePointer 2018-04-12 20:08:37 +02:00
thomas desveaux
66e3576871 Remove visibility-inlines-hidden from visibility api 2018-04-12 19:30:32 +02:00
thomas desveaux
aea34396fa Merge remote-tracking branch 'origin/master' into visibility-hidden 2018-04-12 19:27:27 +02:00
thomas desveaux
906e86d994 Merge remote-tracking branch 'origin/master' into omit-frame-pointer 2018-04-12 19:24:09 +02:00
Thomas Desveaux
80e2bb02e6 Merge remote-tracking branch 'origin/master' into struct-member-align 2018-04-11 14:08:50 +02:00
Emilio López
2b133b16f8 * Move systemversion to config scope instead of project scope on VS. The UI can't do this but setting it actually works 2018-04-10 20:38:31 +01:00
Thomas Desveaux
d556b6510f Implement unsignedchar for msc 2018-04-10 20:24:05 +02:00
Thomas Desveaux
40f258b2d1 Implement unsignedchar for clang 2018-04-10 20:14:22 +02:00
tdesveauxPKFX
2794751092
Merge branch 'master' into unsigned-char 2018-04-10 20:11:41 +02:00
Thomas Desveaux
7d23654c16 structmemberalign: simplify API 2018-04-10 20:10:49 +02:00
tdesveauxPKFX
c92c58037b
Merge branch 'master' into struct-member-align 2018-04-10 20:02:02 +02:00
tdesveauxPKFX
56550c0dd0
Merge branch 'master' into visibility-hidden 2018-04-10 19:48:11 +02:00
Thomas Desveaux
2d8271c1e2 Pull VisibilityHidden from flags to an API + Add all possible values 2018-04-10 19:46:36 +02:00
Thomas Desveaux
e674071bb8 Implement omitframepointer for clang 2018-04-10 19:35:23 +02:00
tdesveauxPKFX
74a9277bf8
Merge branch 'master' into omit-frame-pointer 2018-04-10 19:17:26 +02:00
Thomas Desveaux
b981e67e89 Add structmemberalign API + implement for vstudio 2018-04-09 17:23:10 +02:00
Thomas Desveaux
de16d5cb87 Add VisibilityHidden to flags + implement for gcc 2018-04-09 17:14:38 +02:00
Thomas Desveaux
0160e82188 Add omitframepointer API + implement for gcc and vstudio 2018-04-09 17:11:38 +02:00
Thomas Desveaux
ba8835fb54 Add UnsignedChar API + implement for gcc 2018-04-09 16:59:02 +02:00
tdesveaux
c9870879c6 VStudio: Implement FxCompile block for hlsl shader compilation 2018-04-07 19:15:45 +02:00
redorav
e2afd0bbfd
Merge branch 'master' into luasocket 2018-04-06 19:16:26 +01:00
Sam Surtees
f7626d4e2a Add 'modules/android/' from premake-android
- Additional changes to get tests working
2018-04-05 20:58:31 +10:00
Tom van Dijck
d93ae33a7f
Merge branch 'master' into luasocket 2018-04-05 12:34:41 +02:00
Jason Perkins
a038f5f459 Replace last global state block in api.reset
Follow up to #1021: I removed the state blocks added by the tests, but neglected to put back a new, empty global state block for the next run.
2018-04-02 09:59:34 -04:00
redorav
fae731656a
Merge branch 'master' into luasocket 2018-03-30 12:46:10 +01:00
Emilio López
51aae62dcb Move luasocket from being a static lib to a binary module 2018-03-30 12:37:25 +01:00
Samuel Surtees
5348773851
Merge pull request #952 from tempura-sukiyaki/xcode4-targetextension
Add support for `targetextension` in xcode4
2018-03-24 16:29:47 +10:00
Jason Perkins
e34c23b64f Clear additional global state between unit test runs
Clears out some global state that was being left over between unit tests runs, causing indeterminate results when running multiple tests against data at the global scope.
2018-03-19 10:10:56 -04:00
Emilio López
b1f352bf67 Embed luasocket as a static library
Add mobdebug lua script to allow debugging premake with ZeroBrane Studio
Add --debugger command line option to enable debugging
2018-03-17 14:47:40 +00:00
Tom van Dijck
ad3b884905
Merge branch 'master' into ssurtees/pathNormalizationFix 2018-01-17 09:24:00 +01:00
J. Perkins
8896359839
Merge branch 'master' into fix-usr-lib64-being-at-front-position 2018-01-11 08:52:58 -05:00
Alexandre Janniaux
1a162d1b14 tools/gcc.lua: fix /usr/lib64 being used as search dir before project's libdir
Move the /usr/lib64 added by the compiler script after every other -L
declaration.

fixes #992
2018-01-10 11:13:47 +01:00
Thomas Desveaux
7df53b5501 isaextensions: change extension BMI1 to BMI 2018-01-09 16:01:32 +01:00
Thomas Desveaux
4dda5d9e4c Add isaextensions api
Allow user to enable extended instructions sets for gcc/clang
2018-01-09 15:46:54 +01:00
Sam Surtees
9039232548 Fixed a bug with normalizing paths that contain dot folders
- Added additional tests
2018-01-08 03:21:55 +10:00
Cat Stevens
b779f6f600 src/base and modules: change links to industriousone.com to working HTTPS github links 2017-12-19 13:52:30 -05:00
Tom van Dijck
177c2f1f91 most subtle bugfix in table.indexof 2017-12-11 09:25:58 -08:00
Tom van Dijck
056e539f4b
Merge pull request #969 from Blizzard/fix-buildoutput-pathvars
Fix buildoutput pathvars
2017-12-07 08:16:08 -08:00
J. Perkins
d6c7a49dc6
Merge branch 'master' into tvandijck-patch-1 2017-12-06 13:07:48 -05:00
Tom van Dijck
0a79816d28 in some contexts we need pathVars regardless of whether the property allows it or not. 2017-12-06 09:42:34 -08:00
Tom van Dijck
e7ace9249c buildinputs and buildoutputs in visual studio don't like pathVars. 2017-12-06 09:42:29 -08:00
J. Perkins
729523475d
Merge branch 'master' into fix-fileconfig 2017-12-06 06:19:23 -05:00
Tom van Dijck
da6ed83a5f return generated fileconfig. 2017-12-05 14:35:22 -08:00
Tom van Dijck
c0257009e9
Move part of the workspace baking up
@starkos, can you think of any reason why this wouldn't be correct.
I don't see any code in the oven.bakeConfigs that actually depends on any output from projects or the bakeChildren.
I might be wrong, but I'd like to make this change if at all possible?
2017-12-05 13:52:34 -08:00
Tom van Dijck
be4d6852eb Add support for wildcards in mapconfig. 2017-12-04 14:59:54 -08:00
Manu Evans
02f5a75fc9
Merge pull request #959 from Blizzard/multiple-gmake2-fixes
Multiple gmake2 fixes
2017-11-30 15:58:22 -08:00
Tom van Dijck
0eb325469b
Merge pull request #960 from Blizzard/sln-determinism
Improve determinism in sln output.
2017-11-30 15:50:42 -08:00
Tom van Dijck
4be1372dcf
Merge pull request #958 from Blizzard/fix-context-addfilter
fix context.addFilter
2017-11-30 14:32:17 -08:00