Commit Graph

3636 Commits

Author SHA1 Message Date
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
tdesveaux
6298b1516e Host: Refactor path normalize 2018-08-12 15:08:13 +02:00
Samuel Surtees
4a47c3e6e3
Merge pull request #1137 from Blizzard/multi_output_deps
Fix gmake multiple-output rule issue.
2018-08-10 15:00:15 +10:00
Samuel Surtees
8e02eac4e4
Merge pull request #1142 from Blizzard/csver
Support for CSDialect
2018-08-10 14:59:50 +10:00
Samuel Surtees
b64a7ccf8c
Merge pull request #1145 from tempura-sukiyaki/xcode4-kind-utility
Add support `kind:Utility` in xcode4
2018-08-10 14:59:26 +10:00
tempura-sukiyaki
fd49222a82 Add support kind:Utility in xcode4 2018-08-01 17:31:10 +09:00
Samuel Surtees
11e11268db
Merge pull request #1144 from tempura-sukiyaki/xcode4-sharedlibtype
Add `sharedlibtype` in xcode4
2018-08-01 15:16:48 +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
Samuel Surtees
7f92793043
Merge pull request #1143 from tempura-sukiyaki/xcode4-consoleapp-targetextension
Fix `targetextension` in xcode4
2018-07-31 19:49:24 +10:00
tempura-sukiyaki
d9b03e790a Add targetextension test in xcode4 2018-07-31 18:32:25 +09:00
tempura-sukiyaki
b89eef55c9 Fix targetextension in xcode4
Add support for ConsoleApp.
2018-07-31 15:51:59 +09:00
thwatson
e152b8ba85 Support for CSDialect 2018-07-27 11:49:58 -07:00
Thomas Desveaux
051ed6a1ab Path normalize: Add test with trailing dot 2018-07-19 18:34:36 +02:00
Samuel Surtees
fec912ddac
Merge pull request #1136 from Gaztin/server-paths
Support server paths
2018-07-19 20:31:56 +10:00
Sebastian Kylander
3fec411a54
Merge branch 'master' into server-paths 2018-07-18 16:37:19 +02:00
Manu Evans
05a58d8d3f Fix gmake multiple-output rule issue. 2018-07-17 16:30:03 -07:00
Sebastian Kylander
b618a94d7c Add tests for server paths 2018-07-17 23:41:22 +02:00
Sebastian Kylander
7089044a4c Support server paths in various path functions 2018-07-17 23:41:14 +02:00
Manu Evans
a713eccf96
Merge pull request #1125 from Blizzard/project_specific_config_order_switch
Swap order of applying project specific config
2018-07-10 14:46:16 -06:00
Manu Evans
bd5a5cdc81
Merge pull request #1126 from Blizzard/android_link_vpaths_fix
vpath android.link fix
2018-07-09 17:07:07 -06: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
Jason Jurecka
c02879d626 vpath android.link fix
The issue that this solves is that if vpaths is used to resolve the
android needed file paths when they are referenced from other directories
within the directory structure but not considered external files.
2018-06-28 11:45:34 -07:00
Manu Evans
ba3b2eb50b
Merge pull request #1118 from tdesveauxPKFX/gmake2/fix-cpp-perfileflags
gmake2: fix cpp perfileflags
2018-06-25 11:53:21 -07:00
Thomas Desveaux
cf4161e78a gmake2: Remove makeVarName from local space to ease user override of perFileFlags 2018-06-18 16:57:40 +02:00
Thomas Desveaux
77f6a080cb gmake2: Fix perFileFlags generation for cpp + unit test 2018-06-18 16:55:26 +02:00
Jordi Vilalta Prat
6af506bbfa
Merge branch 'master' into fix/xcode-autocompletion 2018-06-15 10:44:17 +02:00