Mihai Sebea
541958e4d2
! fixed pepper fish to work with lua 5.3.4
2018-09-08 23:12:44 +02: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
Jordi Vilalta Prat
97e3a07c1c
Don't add a file to a target if it isn't built on any configuration
...
Without this, files are added to the exclude list on all configurations,
which disables autocompletion on Xcode. If a file is just excluded in
some configurations it's handled the old way.
2018-06-15 10:36:35 +02: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
Manu Evans
fddc822c8b
Merge pull request #1113 from Blizzard/buildaction_for_cpp
...
Support buildaction for C++ projects
2018-06-08 17:22:38 -07: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
Samuel Surtees
f46a27ec6e
Merge pull request #1108 from Blizzard/gmake_fix
...
Fix gmake2
2018-06-05 20:26:08 +10:00
Manu Evans
4d338127c3
Merge pull request #1104 from erincatto/master
...
Xcode Fixes
2018-06-04 18:41:09 -07:00
Sungun Park
9219bd6c6d
Fix gmake2 ( #169 )
...
bindirs are added to make files for gmake2
2018-06-04 17:58:47 -07:00
Erin Catto
273c506d52
Merge branch 'master' into master
2018-06-03 10:05:26 -07:00
Erin Catto
958217828d
Removed invalid comment
2018-06-03 10:02:37 -07:00
Thomas Desveaux
9c6e195936
Merge pull request #1103 from tdesveauxPKFX/fix-makefile-shelltype
...
gmake*: fix shell type identification
2018-06-03 17:37:35 +02:00
thomas desveaux
7ba491cae6
gmake*: fix shell type identification
2018-06-03 16:47:13 +02:00
Samuel Surtees
d6dfaa3bad
Merge pull request #1105 from tdesveauxPKFX/gmake/fix-targetdir-dep
...
gmake: Add rules and dependencies for directory creation
2018-06-04 00:23:36 +10:00
Samuel Surtees
313d7ed1d0
Merge pull request #1100 from tdesveauxPKFX/gmake2/fix-perfile-nopch
...
gmake2: Remove pch from FORCE_INCLUDE to allow NoPCH per-file
2018-06-03 23:23:06 +10:00
Thomas Desveaux
85a4509c97
Merge pull request #1107 from Blizzard/winsdk_arm
...
Only set WindowsSDKDesktopARMSupport for windows systems (#172 )
2018-06-02 16:02:22 +02:00
Patrick Doane
81323cfa68
Only set WindowsSDKDesktopARMSupport for windows systems ( #172 )
2018-06-01 18:45:56 -07:00
Thomas Desveaux
e047f9dbbd
gmake: Add rule to create directories
...
+ set dependencies to said rules
+ fix tests
2018-06-01 21:26:36 +02:00