Commit Graph

2832 Commits

Author SHA1 Message Date
Jason Stewart
c34eee3e05 Fix VS2015 sln icon
This is a minor fix to make the correct sln icon appear in Windows. The
Icon Handler for sln files is apparently quite picky.

VS2015 sln files contain this:
# Visual Studio 14

Not this:
# Visual Studio 2015

Having 2015 instead of 14 does not appear to cause any major issues. But
you get the generic sln file icon in Explorer instead of the
VS2015-specific one.
2016-12-14 13:48:57 -05:00
Tom van Dijck
5bf562d5ae Merge pull request #645 from Blizzard/vs2017-support
Add 'vs2017' target.
2016-12-13 08:59:13 -08:00
Jason Perkins
4af604ffb6 Merge pull request #643 from starkos/fix-vs-file-path-map
Fix VS mapping for `file.path` tokens
2016-12-08 09:34:01 -05:00
Tom van Dijck
58ba0d8bd7 Merge pull request #648 from starkos/fix-outdated-xcode
Fix out-of-date sources in the Xcode module
2016-12-07 09:47:33 -08:00
Jason Perkins
e2e2841fc7 Fix out-of-date sources in the Xcode module
I must not have been on the latest revision when I merged the Xcode module into core. This catches things back up to the state of the submodule repository.
2016-12-06 13:52:20 -05:00
Tom van Dijck
be7d8a2e4c Add 'vs2017' target. 2016-12-01 12:41:38 -08:00
Jason Perkins
acfde92a79 Fix VS mapping for file.path tokens
The `%{file.path}` token is an alias of `%{file.relpath}`, and should map to the same VS symbol. Specifically, it should be the relative path including the file name, and not just the path.
2016-11-30 14:18:37 -05:00
Tom van Dijck
aa9762bfed Merge pull request #641 from starkos/fix-shared-flags
Fix bugs introduced by shared compiler flags
2016-11-29 10:00:40 -08:00
Jason Perkins
0731044ae7 Fix bugs introduced by shared compiler flags
Fix a few spots where the shared compiler flag changes (PR #623) caused things to misbehave.

- Fixed duplicate flags in VC 200x external compiler options
- Added missing C and CXX flag maps to Clang adapter
- Reworked SNC adapter to follow same shared flags approach
2016-11-29 11:29:32 -05:00
NTAuthority
f069ff732e Add MSBuild target to Bootstrap.mak 2016-11-28 03:43:49 +01:00
Samuel Surtees
1ed7b0c3fe Merge pull request #637 from starkos/fix-vs2015-link-symbols
Fix VS'15 <GenerateDebugInformation> to match Update 3
2016-11-25 18:12:30 +10:00
Samuel Surtees
17a3986da2 Merge pull request #636 from starkos/fix-msc-flags
Fix MSC flags broken by PR #623
2016-11-24 20:19:13 +10:00
Jason Perkins
9017431249 Fix VS'15 <GenerateDebugInformation> to match Update 3 2016-11-23 16:00:05 -05:00
Jason Perkins
c6e400916e Fix MSC flags broken by PR #623 2016-11-23 15:50:45 -05:00
Samuel Surtees
4a0cebf0af Merge pull request #619 from Blizzard/per-file-config-C#
Add support in csproj backend to add files to certain configurations.
2016-11-23 14:05:38 +10:00
Tom van Dijck
f7d98519a8 Merge pull request #635 from robertop/parallel-make
Makefile generation - Don't force serial compilation for all projects
2016-11-22 10:48:02 -08:00
Tom van Dijck
5bb7c54e3f Add support in csproj backend to add files to certain configurations. 2016-11-22 09:45:02 -08:00
Roberto Perpuly
b5d7f944b3 Makefile generation - Don't force serial compilation for all projects
Only restrict parallel compilation when using precompiled
headers. Currently, the generated makefile has a `.NOTPARALLEL`
target, which means that make will ignore parallel builds, even
for projects which can build in parallel just fine.
2016-11-22 09:22:32 -08:00
Tom van Dijck
24f2da8842 Merge pull request #623 from mikisch81/gcc-add-c90-c99-flags
Added C90 and C99 flags to gcc
2016-11-22 09:12:07 -08:00
Tom van Dijck
94ab7bbb64 Merge pull request #634 from starkos/fix-default-rule-var-kinds
Default rule variables to string when `kind` is not set
2016-11-22 09:09:55 -08:00
Tom van Dijck
5c1d86ab78 Merge pull request #628 from aleksijuvani/no-link-objects-flag
Add NoLinkObjects flag
2016-11-22 09:08:02 -08:00
Michael Schwarcz
3bc5e9623e Merge branch 'master' into gcc-add-c90-c99-flags 2016-11-22 15:44:44 +02:00
aleksijuvani
f337abb776 Add tests for linkbuildoutputs API 2016-11-22 13:50:26 +02:00
aleksijuvani
b1825c9ccd Always output LinkObjects for Visual Studio if specified 2016-11-22 13:36:20 +02:00
aleksijuvani
bceebd082c Change NoLinkObjects flag to a linkbuildoutputs API 2016-11-22 00:18:08 +02:00
aleksijuvani
e47ba372c8 Add NoLinkObjects flag
The default behaviour is to link .obj files if a custom build command
outputs them, but there are some cases where we don't want this to
happen, such as when dealing with Wavefront .obj model files.

This commit will prevent the automatic linking of .obj files that have
this new flag.

When an obj file is outputted by a custom build command, this prevents
the linker from linking it. This is necessary, for example, when
dealing with obj model files.
2016-11-22 00:18:08 +02:00
Tom van Dijck
2b887281c1 Merge pull request #633 from starkos/fix-http-build-warnings
Fix data type conversion warnings in HTTP response handling
2016-11-21 11:01:09 -08:00
Jason Perkins
cf87c66ec1 Default rule variables to string when kind is not set
Because this is the most common case, we've been treating variables with no `kind` as an implicit string value.
2016-11-21 13:37:08 -05:00
Jason Perkins
30e8e4b510 Fix data type conversion warnings in HTTP response handling 2016-11-21 11:41:04 -05:00
Michael Schwarcz
8d9fee6941 Fix codelite module test failure
- Align clang cflags and cxxflags with gcc
2016-11-14 17:04:10 +02:00
Michael Schwarcz
0360b83669 Added C90 and C99 flags to gcc
- Split gcc.cflags to 2 tables: gcc.shared and gcc.cflags in order to allow adding relevant compilation flags to CC and CXX.
- ALL_CXXFLAGS should append ALL_CPPFLAGS and not ALL_CFLAGS.
2016-11-14 15:55:08 +02:00
Tom van Dijck
7f1b426f21 Merge pull request #625 from starkos/phase-out-submodules
Move core modules into main repository; drop submodules
2016-11-10 20:17:39 -08:00
Jason Perkins
af7b674265 Move core modules into main repository; drop submodules
As discussed numerous times, get rid of the submodule approach for core modules and just included the sources directly in the main repository.

I have no idea how this will play with existing working copies. It might be necessary to [manually clear out the existing submodules](http://stackoverflow.com/questions/1260748) first.
2016-11-09 14:29:33 -05:00
Samuel Surtees
71be275023 Merge pull request #618 from Blizzard/fix-for-fastlink
Fix for debugInformationFormat handling with FastLink.
2016-11-08 11:04:44 +10:00
Samuel Surtees
4c5b4b8445 Merge pull request #521 from Blizzard/default-clang-macosx
Select clang as default tool on MacOSX.
2016-11-08 10:55:35 +10:00
Tom van Dijck
ca89c9d79b Fix for debugInformationFormat handling with FastLink. 2016-11-07 09:44:47 -08:00
Tom van Dijck
449163ebf3 Select clang as default tool on MacOSX. 2016-11-07 08:54:25 -08:00
Samuel Surtees
30dda54f12 Merge pull request #600 from sbx320/bugfix/598
Fix for #598
2016-11-04 12:02:24 +10:00
Samuel Surtees
4985e5b8f4 Merge pull request #607 from LORgames/ssurtees/monodevelop
Removed MonoDevelop from core
2016-11-04 11:24:49 +10:00
Samuel Surtees
1b9af9aa6c Merge branch 'master' into bugfix/598 2016-11-04 03:17:04 +10:00
Samuel Surtees
9eedf6b5d8 Merge branch 'master' into ssurtees/monodevelop 2016-11-04 03:10:59 +10:00
Tom van Dijck
8b9130dc5d Merge pull request #613 from LORgames/ssurtees/dotFileFix
Added a test dot file instead of relying on .gitignore to be shipped
2016-11-03 10:07:02 -07:00
Sam Surtees
ac88483ccc Added a test dot file instead of relying on .gitignore to be shipped
Fixes #595
2016-11-03 21:22:42 +10:00
Samuel Surtees
f5707c4d4e Merge pull request #611 from sbx320/bugfix/pchforceinclude
make: Fix forceincludes breaking precompiled headers
2016-11-03 20:33:01 +10:00
Samuel Surtees
e91bc6d57e Merge pull request #610 from mikisch81/vstudio-makefile-proj-includes-defines
Apply includedirs and defines for makefile projects in Visual Studio
2016-11-03 20:15:26 +10:00
Samuel Surtees
ecc0d0b739 Merge pull request #608 from mikisch81/fix-vstudio-staticlib-deps
VStudio: Add additional deps & additional libdirs for static lib
2016-11-03 20:10:10 +10:00
Samuel Surtees
81a9df934b Merge pull request #603 from andryblack/arargs
allow override AR arguments
2016-11-03 20:06:58 +10:00
Samuel Surtees
2e74dd464f Merge pull request #605 from LORgames/ssurtees/fixedObjdirsPrefixCode
Fixed bug with objdirs prefix code '!'
2016-11-03 19:23:05 +10:00
Samuel Surtees
2b85869c24 Merge pull request #583 from LORgames/ssurtees/duplicateBuildCommands
Added ability for duplicate build commands to be specified
2016-11-03 19:20:47 +10:00
Sam Surtees
e8789acbe7 Added ability for duplicate build commands to be specified. Fixes #540 2016-11-03 19:16:37 +10:00