Commit Graph

3363 Commits

Author SHA1 Message Date
Justin Chrysler
80a85aed7d Updated code lite to properly add LD_LIBRARY_PATH is set if libdirs is set 2018-12-21 19:29:27 -05:00
Samuel Surtees
6e380c0242
Merge pull request #1203 from tempura-sukiyaki/vsandroid-javacompile
Add support for JavaCompile in vsandroid
2018-12-06 18:17:40 +10:00
tempura-sukiyaki
0002511d08 Add support for JavaCompile in vsandroid 2018-12-06 16:47:55 +09:00
Samuel Surtees
0f0c1d134e
Merge pull request #1202 from Blizzard/file_name
Support %{file.name} token in VS
2018-12-05 16:18:08 +10:00
Manu Evans
f898eb376b Support %{file.name} token in VS. 2018-12-04 18:55:30 -08:00
Samuel Surtees
6fc0497d6a
Merge pull request #1197 from LORgames/ssurtees/makefileFixes
Added missing elements in Visual Studio Makefile projects
2018-11-30 11:19:21 +10:00
Sam Surtees
62ae78976b Added missing elements in Visual Studio Makefile projects
Fixes #670
2018-11-21 00:53:00 +10:00
Samuel Surtees
52f3c575ba
Merge pull request #1194 from WorldofBay/patch-2
Move rule property string expansion into modules
2018-11-18 23:33:15 +10:00
WorldofBay
de1398af25 Move rule property expansion into modules
Reuse code in gmake2 module
Adjust vs2010 test for fixed behaviour
Add vs2010 test for custom separator
2018-11-16 11:21:41 +01:00
Samuel Surtees
85d0b3e34c
Merge pull request #1189 from tdesveauxPKFX/host/fix_normalize_tokens
Host path.normalize: Fix normalization for paths containing tokens
2018-11-13 17:59:39 +10:00
Samuel Surtees
a7c9952665
Merge pull request #1193 from ratzlaff/xcode_id_test
Add tests for xcode id generator
2018-11-13 17:33:22 +10:00
Ben Ratzlaff
ce6ff58da2 Add tests for xcode id generator 2018-11-12 21:27:24 -07:00
Thomas Desveaux
491051a273
Merge pull request #1191 from ratzlaff/fix_obj_collisions
Fix objname collisions
2018-11-12 19:49:59 +01:00
Ben Ratzlaff
8d139aea31 Fix objname collisions 2018-11-09 23:08:27 -07:00
tdesveaux
a1d7e8657c Host path.normalize: Fix normalization for paths containing tokens 2018-11-04 18:01:29 +01:00
Samuel Surtees
ed483dd9bc
Merge pull request #1181 from premake/release-5.0-alpha13
Release 5.0 alpha13
2018-10-28 14:17:37 +10:00
Thomas Desveaux
e7721ba149 Post-release: Set PREMAKE_VERSION to dev 2018-10-22 13:49:27 +02:00
Thomas Desveaux
fb9264ff40 README: Update Commit since last release shield 2018-10-22 13:44:28 +02:00
Thomas Desveaux
54c3f9bb16 Add merged PRs since alpha12 to CHANGES.txt 2018-10-22 13:44:16 +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
Thomas Desveaux
995dd065ff Add script to compute PRs git logs to CHANGES.md format
Replace PRlogs_to_RELEASE_format.py with changes.lua

changes.lua: Add an option to choose remote + set origin as default remote

changes.lua: Simplify sort

changes.lua: Fix regex matching author name
2018-10-22 13:43:27 +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
087835887a
Merge pull request #1177 from WorldofBay/patch-4
Enable property categories in VS projects
2018-10-18 20:58:16 +10: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
ea984e9c1c Enable property categories in VS projects
Don't allow adding to "Command Line" though.
2018-10-18 12:01:15 +02: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
Samuel Surtees
ca5e62bce7
Merge pull request #1179 from tempura-sukiyaki/xcode4-xcodebuildsettings-using-false
fix `xcodebuildsettings` using false
2018-10-17 23:07:15 +10:00
tempura-sukiyaki
9122554c08 fix xcodebuildsettings using false 2018-10-17 21:18:03 +09:00
Samuel Surtees
367b227d22
Merge pull request #1178 from cengizIO/master
Avoid impl dependent multi-char constants
2018-10-16 18:27:47 +10: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
Samuel Surtees
ea1df508bc
Merge pull request #1176 from tdesveauxPKFX/host/fix_normalize
path.normalize: Fix when call with path surrounded with quotes
2018-10-12 11:01:16 +10:00
Thomas Desveaux
f68c386341 path.normalize: Fix when call with path surrounded with quotes 2018-10-11 14:21:42 +02:00
Samuel Surtees
0601ec697f
Merge pull request #1167 from tempura-sukiyaki/xcode4-buildcommands
Add support for per-file custom build commands in xcode4
2018-09-30 13:46:00 +10:00
tempura-sukiyaki
30fd3e990e Add support for per-file custom build commands in xcode4 2018-09-10 20:28:37 +09:00
Samuel Surtees
e82fc62095
Merge pull request #1164 from neo2buha/fix_pepper_fish
! fixed pepper fish to work with lua 5.3.4
2018-09-09 22:49:04 +10:00
Mihai Sebea
541958e4d2 ! fixed pepper fish to work with lua 5.3.4 2018-09-08 23:12:44 +02:00
Samuel Surtees
279b2b00c1
Merge pull request #1161 from tempura-sukiyaki/xcode4-systemcapabilities
Add `xcodesystemcapabilities` in xcode4
2018-09-06 21:32:16 +10:00
tempura-sukiyaki
5a9880ef26 Add xcodesystemcapabilities in xcode4 2018-09-06 18:57:47 +09:00
Samuel Surtees
1abac192cb
Merge pull request #1117 from sp-jordi-vilalta/fix/xcode-autocompletion
Fix Xcode autocompletion with excluded files
2018-08-22 22:36:04 +10:00
Jordi Vilalta Prat
043eaaf290
Merge branch 'master' into fix/xcode-autocompletion 2018-08-22 11:42:59 +02:00
Jordi Vilalta Prat
2724cf672b Use p.warn() instead of print() 2018-08-22 11:41:37 +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
439a1b373d Path normalize: Add test for server path (//) 2018-08-12 15:17:20 +02:00