Commit Graph

114 Commits

Author SHA1 Message Date
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
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
sbx320
52b9d1164f make: Fix forceincludes breaking precompiled headers 2016-11-02 06:32:47 +01:00
Andrey Kunitsyn
65ced6a6b0 allow override ar arguments 2016-10-27 00:05:40 +03:00
Joao Matos
e06218c885 use rpaths & soname/install_name to link sibling shared libraries on OS X and Linux
new api runpathdirs().
	<toolset>.getrunpathdirs() adds user defined rpath set using runpathdirs().
	handle runpathdirs in gcc, clang and snc.

make.list() can now add quotes to list elements

Original patch by Renaud Guillard (@noresources).
2016-08-17 16:48:41 +01:00
Tom van Dijck
43547450dd Fix precompiled header file lookup in gmake backend. 2016-05-02 16:55:50 -07:00
Jason Perkins
834a4e46d2 Merge pull request #376 from Blizzard/makefile-utility-gmake
Add utility and makefile type in gmake.
2016-01-26 18:46:29 -05:00
Jason Perkins
309ef32ff8 Move character set command line flags from switch lists to defines 2016-01-18 14:11:50 -05:00
Jason Perkins
febb313eaa Merge pull request #387 from stream009/fix-cc
Fix "--cc" command line option
2015-12-27 15:06:54 -05:00
stream
3b7e983eca Write pchheader to Makefile as reletive path 2015-12-27 03:26:29 +09:00
stream
fef741eebb Support "--cc" command line option 2015-12-27 03:22:51 +09:00
Tom van Dijck
6becbafa66 Add utility and makefile type in gmake. 2015-12-18 12:46:04 -08:00
Mark Sararu
0a3ce657a8 Fix include directories being escaped twice 2015-10-10 10:24:19 -07:00
Sami Kankaristo
77efd0bab3 Add basic support for the 'Utility' kind in gmake 2015-10-01 05:34:49 +03:00
Manu Evans
74d53e366d ${CUSTOMFILES} is often used to produce dependencies for the build, so it needs to be first. 2015-09-16 15:17:55 +10:00
Tom van Dijck
ef8d818c62 fix bug in make_cpp.lua 2015-08-17 07:39:11 -07:00
Manu Evans
bade299f6b Updated gmake actions to use function arrays
- Updated gmake action in the D module aswell
2015-07-27 23:14:32 +10:00
leeonix
a01225a90a modify gmake Makefile LINKCMD $(TARGET) to "$@" issue #125 2015-06-25 07:03:10 +08:00
Tim Wharton
45401aa57b Enable Makefile environment overrides for CC,CXX and AR.
Check if CC, CXX or AR are their default values before assigning them their premake defaults.
If they are not at their default values, they have been overriden in the environment and we should leave them alone.

Overriding toolchains from the command line is useful when swapping between compilers.
For example: `CC=gcc-4.8.1 make -C build`
2015-06-08 04:46:16 +01:00
Jason Perkins
4d708b2580 Add sysincludedir() support to makefiles 2015-05-19 15:56:37 -04:00
Manu Evans
f03898de68 Added 'undefines' api.
Support VS200x, 201x, gmake
2015-03-10 08:49:19 +10:00
Jason Perkins
eb0904698f Fix escaping of multiple build rule inputs 2014-12-08 12:44:51 -05:00
Jason Perkins
8756cd3eed Add missing quotes around PCH compile flags (h/t Daniel Gibson)
See comment at 7e583c84a3 (comment-1468822)
2014-12-08 11:47:55 -05:00
Jason Perkins
6e12c6485f Move command token expansion into actions, to allow more control at point of export 2014-11-29 14:51:49 -05:00
Jason Perkins
8eef265558 Fix issue #21: ARCH variable conflicts with building on Gentoo
Remove the $(ARCH) variable from generated makefiles. If needed, we can come up with a different name that doesn't conflict with existing system variables.
2014-11-19 12:29:19 -05:00
Jason Perkins
ba74e661fa Move cfg.linkoptions out of toolset getldflags() to match behavior of getcflags() and getcxxflags() 2014-11-05 16:25:58 -05:00
Jason Perkins
88dc2cb8a8 Merged in dcourtois/premake-dev/custom_build_additional_inputs (pull request #131)
added a buildinput command to add additional input dependencies to custom build commands.
2014-09-28 14:52:43 -04:00
Aleksi Juvani
7640661f4b Fix per-file custom build commands in C++ gmake action 2014-09-27 15:30:42 +00:00
Damien Courtois
7c4eed3d1c added buildinputs support to make action 2014-09-26 15:24:23 +02:00
Stefan Cosma
20e44b9f34 - Fix gmake parallel builds when using precompiled headers 2014-06-05 18:11:03 +02:00
Jason Perkins
b0103e76ca Add getLibraryDirectories() to tool adapters
- use throughout to avoid flag duplication in VS projects with external tools
2014-05-23 20:10:34 -04:00
Jason Perkins
1b28b48a6b Fix duplicate flags in Gmake PCH build commands (Patrick Rapin) 2014-02-14 15:22:32 -05:00
Jason Perkins
6b7a05722d Route all output through premake.out() to simplify interception and overriding.
Fix a related bug in the C++ makefile generator.
2014-02-08 12:26:18 -05:00
Jason Perkins
1cbc2bef9d Clean up pass over output APIs used by exporters
- Reworked _p() and _x() over new indentation-aware output APIs
- Added proper APIs for setting indentation, EOL sequence, and value escaping
- Moved functions intended for exporters to premake.lua (with generation and validation calls)
2014-02-08 10:44:57 -05:00
Oliver Schneider
2ce5c148ac Same fix as for premake-stable 2014-02-04 00:47:12 +00:00
Jason Perkins
b5e7a345fb Merged in triton/premake-cs-fixes/make-rc2 (pull request #71)
Fixed resource compiler tool in the C++ Make backend.
2013-10-31 11:19:09 -04:00
Jason Perkins
1b105e377d Pass same flags to PCH compile as C/C++ source code 2013-10-03 10:47:14 -04:00
Jason Perkins
64c220b70a Project locations are now inherited from the solution, if set. 2013-09-30 10:16:56 -04:00
triton
6e15d08b16 Fixed resource compiler tool in the C++ Make backend. 2013-09-27 01:52:06 +01:00
Jason Perkins
e681b636ec More code cleanup:
- Drop premake5 namespace; everything is premake again
- Remove deprecated project and config APIs
2013-09-13 11:15:36 -04:00
Jason Perkins
3b8a115db8 Leave PCH header path alone if no match is found in includedirs 2013-08-15 13:44:54 -04:00
Jason Perkins
2431aa9fae Improved handling of precompiled headers across toolsets 2013-08-13 10:56:01 -04:00
Jason Perkins
99ce5cfbbf Rework Gmake C++ exporter to use new extensibility conventions 2013-08-11 14:22:24 -04:00
Jason Perkins
b18e8b7ccd Swapped $(LIBS) and $(ALL_LDFLAGS) in makefile linking step (Ben Henning)
See http://sourceforge.net/p/premake/bugs/279/
2013-08-11 09:54:17 -04:00
Jason Perkins
b3fdb1457d Merge more file configuration functionality into new fileconfig class 2013-07-12 11:07:26 -04:00
Jason Perkins
4b251b2036 Excluded files are no longer considered in duplicate object file renumbering 2013-07-07 16:48:17 -04:00
Jason Perkins
5c87c62de1 Split handling of include directories and force includes; wrap all include paths in quotes 2013-06-27 13:50:12 -04:00
Jason Perkins
2f1fe980ef Duplicate object file names are now ordered the same across all toolsets 2013-06-21 17:32:33 -04:00
Jason Perkins
4bd950d130 Make escaping function configurable; fix (non-)escaping of quotes in VS'10 and '12 2013-05-22 11:15:48 -04:00
Alexey Orlov
38ba3c5e41 [gmake] allow mixing c files in cpp projects: review changes, test added 2013-05-02 15:36:11 +03:00