Commit Graph

3296 Commits

Author SHA1 Message Date
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
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
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
Erin Catto
4c8a14f71f Fixed Xcode test 2018-05-31 21:54:29 -07:00
Erin Catto
6da758cdd7 Xcode Fixes
Fix cppdialect=C++11
Fix angle bracket include complaints
2018-05-31 21:00:15 -07:00
thomas desveaux
4250aa3928 gmake2: Add unit tests for PCH include 2018-06-01 01:42:02 +02:00
Thomas Desveaux
807f318c47 gmake2: Remove pch from FORCE_INCLUDE to allow NoPCH per-file 2018-05-30 17:52:36 +02:00
Thomas Desveaux
ff732af5f6
Merge pull request #1098 from tdesveauxPKFX/d/vstudio/remove-dcompile-block
Prevent D module from adding D block in unrelated projects
2018-05-29 20:58:32 +02:00
Thomas Desveaux
b1efce39df D: Do not output DCompile block in vstudio if no d file in project 2018-05-29 19:26:27 +02:00
Samuel Surtees
3d522e9068
Merge pull request #1096 from tdesveauxPKFX/gmake2-pch-dependencies
gmake2: Fix dependency for pch
2018-05-29 11:16:24 +10:00
Samuel Surtees
31428b14ce
Merge pull request #1040 from ratzlaff/compileas
Get 'compileas' working when using a 'filter "files: ..."' scope.
2018-05-29 11:16:09 +10:00
Ben Ratzlaff
be3742dd2a Get 'compileas' working when using a 'filter "files: ..."' scope. 2018-05-28 15:17:04 -07:00
Thomas Desveaux
d173b077bd gmake2: Fix dependency for pch. Changes in headers included in pch would not be properly detected. 2018-05-28 22:41:21 +02:00
Samuel Surtees
e45b8cfc6b
Merge pull request #1092 from Gaztin/codelite-groups
CodeLite workspace folders (groups)
2018-05-24 19:59:48 +10:00
Samuel Surtees
e03412afbf
Merge pull request #1093 from Gaztin/codelite-debugenvs
Implemented 'debugenvs' for CodeLite
2018-05-24 19:59:22 +10:00
Sebastian Kylander
d42bcf54f7 Add tests for CodeLite debugenvs 2018-05-23 21:43:53 +02:00
Sebastian Kylander
df8ea09cdd Implement debugenvs for CodeLite 2018-05-23 21:43:19 +02:00
Sebastian Kylander
531437901d Add tests for CodeLite workspace folders 2018-05-22 00:31:27 +02:00
Sebastian Kylander
fec55c549f Implement CodeLite workspace folders 2018-05-22 00:30:58 +02:00
Manu Evans
bfcf22b1e1
Merge pull request #1089 from TurkeyMan/translate_imp_paths
Import paths weren't translated properly
2018-05-19 13:28:30 -07:00
Manu Evans
8dac762d6f Translate the import paths 2018-05-19 11:21:09 -07:00
Samuel Surtees
4e1452214c
Merge pull request #1087 from rorydriscoll/master
Fix missing DebugInformationFormat when symbols are set to full
2018-05-15 18:49:16 +10:00
Rory Driscoll
a1f9874f46 Fix missing DebugInformationFormat when symbols are set to full 2018-05-14 22:10:51 -07:00
Thomas Desveaux
2b0e3f1442
Merge pull request #1084 from SchmidtD/master
Fix httpbin useragent response format.
2018-05-11 20:55:37 +02:00
Daniel Schmidt
30d22de0b6 Fix httpbin useragent response format. 2018-05-11 10:49:15 +02:00
Samuel Surtees
4911f14ac8
Merge pull request #1081 from tvandijck/cache-canUseColors
cache results of shouldUseColors()
2018-05-08 20:56:20 +10:00