Commit Graph

345 Commits

Author SHA1 Message Date
Jason Perkins
94e29b7cf3 Merge with premake-dev 2011-12-13 16:14:14 -05:00
Jason Perkins
5b6f8f6f36 Patch 3451212: Fix Visual Studio MFC with StaticRuntime 2011-12-13 16:10:22 -05:00
Jason Perkins
acebe2cc9c Patch 3430158: Reorder LINKCMD for Gmake (rjmyst3) 2011-12-08 16:25:50 -05:00
Jason Perkins
458d62ca36 Merge with Premake-dev 2011-12-07 16:10:27 -05:00
Jason Perkins
c8e3c0df6a Improve include() function: only include files once, and allow including specific files instead of just directories 2011-12-04 14:47:59 -05:00
Jason Perkins
b5d7bba342 Added debugformat, with C7 support for Visual Studio 2011-11-19 16:50:50 -05:00
Jason Perkins
4bf628ac12 Fixed Xcode unit tests on non-Mac OSes 2011-11-19 12:10:58 -05:00
Jason Perkins
07853b1e34 Patch 3451928: VS2008 trying to build *.h files in C projects 2011-12-06 15:14:43 -05:00
Jason Perkins
b0b881284e Improved handling of linker defaults in VS2010 2011-11-13 15:07:31 -05:00
Jason Perkins
2a8b81ac8d Merge latest changes from premake-dev 2011-11-13 09:27:27 -05:00
Jason Perkins
02234cffa9 Patch 3381066: Fix VS2010 project references 2011-11-08 16:43:49 -05:00
Jason Perkins
b7fac3f46e Patch 3317329: Support vstudio CompileAs for mixed-language projects (xpol) 2011-10-21 15:32:18 -04:00
Jason Perkins
7c3716fc77 Patch 3372345: Gmake action's PCHs don't work with Mingw (Martin Ridgers) 2011-10-20 16:44:09 -04:00
Jason Perkins
2a0a79c243 Patch 3367641: Remove warnings in Xcode 4 2011-10-20 16:36:24 -04:00
Jason Perkins
15af117ef9 Patch 3035550: Make/Distcc outputs dependencies to wrong location 2011-09-19 16:45:49 -04:00
Jason Perkins
dfda94d862 Patch 3021550: Add Wii homebrew platform (Pathogen David) 2011-09-15 16:45:48 -04:00
Liam Devine
4eeb4f76f3 * Bug 3381149: Path of PCH source file in VS10 not being translated (intyuh)
Re- added unit test removed in 53abc69ab87c
Applied patch from intyuh
2011-09-08 14:30:10 +01:00
Liam Devine
5ef5682c94 * Bug 3381149: Path of PCH source file in VS10 not being translated (intyuh)
Re- added unit test removed in 53abc69ab87c
Applied patch from intyuh
2011-09-08 14:24:05 +01:00
Liam Devine
7185aaf0a0 * Added debug environment variable support for Codeblocks using gdb
Changes the name from environmentargs to debugenvs
Effects VS flags EnvironmentArgsInherit and EnvironmentArgsDontMerge which become DebugEnvsInherit and DebugEnvsDontMerge respectively.
2011-08-23 21:48:16 +01:00
Jason Perkins
8f6fd68f7a Fixed #3381011: location breaks vpaths 2011-08-22 16:35:51 -04:00
liamDevine
1fdb95e142 VS200X Environment Args. Does not use the flag EnvironmentArgsInherit 2011-08-22 10:51:28 +01:00
liamDevine
80eff1c9fd Adds environmentargs for vs10 and flags which define specifics for them.
Flags
EnvironmentArgsDontMerge - Default is to merge these Environment arguments specified with the current environment args.
EnvironmentArgsInherit - Inherits from parent or project defaults.
2011-08-22 10:14:42 +01:00
liamDevine
89c197a189 Arrrr didn't test that last one before committing. I hang my head in shame. 2011-08-22 00:57:59 +01:00
liamDevine
53e5a796cb Oops left a couple of variables which were used to find the error. See last commit for info. 2011-08-22 00:56:11 +01:00
liamDevine
8cb574e685 The function premake.action.set (which I only see used in xcode3 tests) has a secret,
it not only sets the action yet can also set the global _OS. Currently when the function is used in
a test suite it should really be reset in a teardown. To make this transparent I have added the
caching of the _OS value set in C code in testfx and it is reset in 'test_setup' with the other
environment resets.
I had a quick look at the commits and can not see how or when this first caused a problem yet findlib
was failing on windows as previous premake.action.set('xcode3') had been made and therefore the
library it was looking for was 'm'.

io.eol is another potential setting which leaves a dirty environment for tests.
2011-08-22 00:52:49 +01:00
Jason Perkins
a887942037 Added virtual path support for CodeBlocks 2011-08-19 08:58:12 -04:00
Jason Perkins
b101ac117a Fixed Xcode3 bug with sources in a subdirectory and grouped in virtual path 2011-08-16 12:22:08 -04:00
Jason Perkins
112483417b Added virtual path support to Xcode3 2011-08-15 16:00:20 -04:00
Jason Perkins
1a074ba81b Added vpath support to VC200x and Codelite 2011-08-09 16:11:35 -04:00
Jason Perkins
f8877df6ea Flipped vpaths syntax, now ['group']={'pattern(s)'...} 2011-07-19 18:07:30 -04:00
Jason Perkins
1631cff164 Removed a bunch of deprecated VC2010 code 2011-07-12 16:55:27 -04:00
Jason Perkins
144c608442 Implemented vpaths for VS2010 2011-07-01 15:05:16 -04:00
Jason Perkins
71cbdbdd7d Lost a commit somewhere; catching up with my local repository 2011-06-30 16:44:40 -04:00
Jason Perkins
9083e8a47e Removed deprecated walksources() function 2011-06-09 15:19:44 -04:00
Jason Perkins
73f6ba2a6c Added project.getvpath() to map from real paths 2011-06-09 15:15:39 -04:00
Jason Perkins
cf3bdb076e Added support for key-value fields to the API 2011-06-02 15:26:15 -04:00
Liam Devine
52ef4b7079 Pulling stable change into dev. 2011-05-27 16:19:07 +01:00
Liam Devine
8d66a5cb12 Incorrect relative paths for gmake sibling static libraries 2011-05-27 15:55:06 +01:00
Jason Perkins
eccd1720ba More cleanup; preparing the virtual path stuff 2011-05-18 17:32:04 -04:00
Liam Devine
7a89211a38 English alais' for the Optimize group of flags 2011-05-18 20:31:08 +01:00
Jason Perkins
dba4adab62 Split configuration baking into its own file; prep for file config work 2011-05-16 15:37:48 -04:00
Jason Perkins
655d6a8a95 Prepped CodeBlocks for new file configs 2011-05-12 16:14:43 -04:00
Jason Perkins
f7609a9fa5 Ported CodeLite to trees 2011-05-12 16:00:07 -04:00
Jason Perkins
eedf10ef6a Tweaks and tests for VS2010 file handling 2011-05-10 13:56:25 -04:00
Liam Devine
8f11c2c5f6 merge with stable 2011-05-07 03:05:16 +01:00
Liam Devine
fb7f74d4bd Fixed bug 3297634 - UnitTest++ folder breaks Xcode 3
Xcode itself only quotes when it needs to yet it is fine to always quote the string.
2011-05-07 02:30:28 +01:00
liamDevine
adb2529b61 Applied patch which sets the target machine in visual studio 2011-05-01 03:09:27 +01:00
Unknown
5ec9f16415 set the platform in vs10 static libs 2011-05-01 01:04:27 +01:00
Liam Devine
33eff629c4 removing dead code 2011-04-30 22:33:52 +01:00
Liam Devine
700cd82280 corrected teardown function name in testing_make_linking.lua
stopped 'runall' from running 'setup' and 'teardown' as tests which also stops the inflated test count that I noticed.
Added writing of runtime to io for test suites.
Added prj = premake.solution.getproject(sln, 1) to vs10 tests and removed the managed flag hack.
2011-04-30 22:29:54 +01:00
liamDevine
6c7b1939d8 ignore entry point in Manged C++ 2011-04-30 00:57:49 +01:00
liamDevine
2773fd8c1c removing dead code and also drawing attention to flags on projects when unit testing 2011-04-30 00:29:30 +01:00
liamDevine
df11537b80 Adding Managed C++ support for vs10 2011-04-30 00:25:12 +01:00
liamDevine
e5da7de916 merge with stable 2011-04-29 23:44:53 +01:00
Unknown
a0fa8c04e0 Fixes Bug 3294459: vs10 x86_64 using incorrect debug format for minimal rebuild
there is not an option for setting /Z7 OldStyle so OldStyle was removed
/ZI is not compatible with /clr or x64_64
minimal Rebuild requires /Zi in x86_64
2011-04-29 02:07:38 +01:00
Jason Perkins
214990943d Bug 3277357: Projects no longer inherit location from solution 2011-04-27 18:43:15 -04:00
Jason Perkins
229e31a465 [#1657833] Set working directory an IDE starts/debugs the program in 2011-04-25 15:55:17 -04:00
Jason Perkins
0357046d36 Merged changes from stable 2011-04-11 14:33:49 -04:00
Liam Devine
37432fef37 gmake correctly links again to SharedLibs and StaticLibs sibling dependencies; yet correctly does not link to a non linkable sibling. 2011-03-29 02:27:10 +01:00
Liam Devine
5ac9af4c8a Commenting out latest changes so that stable is not broken. The test is left in and will fail while I look at the problem with gmake. 2011-03-29 00:08:26 +01:00
Liam Devine
f9027da963 sln was in global and not reset to nil in teardown 2011-03-26 01:37:26 +00:00
Liam Devine
f4a8f024d9 * Patch 3043933 gmake incorrectly links using -l when a solution contains a .so and .a of the same name and the static lib is wanted (Jonathan Derque) 2011-03-26 00:39:26 +00:00
Liam Devine
26db36c266 * Patch 3043933 gmake incorrectly links using -l when a solution contains a .so and .a of the same name and the static lib is wanted (Jonathan Derque) 2011-03-26 00:21:44 +00:00
Jason Perkins
d9f30a983a Fixed failed merge 2011-03-24 17:09:58 -04:00
Jason Perkins
ccb5d34c95 Merged with premake-stable 2011-03-23 17:05:19 -04:00
Jason Perkins
7b0636f999 [#3232160] Environment variables are cut off 2011-03-23 16:38:40 -04:00
Liam Devine
801808062d 3157645: Respects full path for xcode frameworks 2011-03-23 15:00:51 +00:00
liamDevine
db972589b1 added specialisation for terms in mergeobject
kind seems special. it gets set in the cfg and is needed by the terms yet not added automatically
added a check when iterating blocks in merge to see if kind needs adding to terms
changed getactiveterms so it doesn't use number keys
at end of merge, added a merging of terms into cfg.terms
terms were being shared between all configurations in collapse. NOTE : it may still need looking at for when the platform is not native.
changed to use a local copy, this gets updated instead.
2011-03-17 04:17:36 +00:00
liamDevine
ea9ac28488 pdb file was being written to the 'Link' section when it needed to be in 'ClCompile'. Reported by hodsondd closes bug report: https://sourceforge.net/tracker/?func=detail&aid=3163703&group_id=71616&atid=531878 2011-03-14 14:59:59 +00:00
Liam Devine
a02fd77b74 Xcode4 workspace relative location paths and workspace generation 2011-03-11 17:08:37 +00:00
Liam Devine
98b9815534 Xcode4 workspace initial 2011-03-11 16:43:19 +00:00
Jason Perkins
bb94e9de81 [#3100379] C# support for Visual Studio 2010 2011-02-16 15:16:07 -05:00
Jason Perkins
a69bcbfb58 Added support for Haiku OS (Yuriy O'Donnell) 2011-02-10 12:24:51 -05:00
Jason Perkins
b3dfe26ec6 Ported VS2005 *.csproj to trees 2011-02-09 11:22:02 -05:00
Jason Perkins
aa090b0cd3 Ported VS2002 *.csproj from walksources to trees 2011-02-08 11:08:16 -05:00
Jason Perkins
43218e0e96 Moved io.capture to test framework; removed from test suites 2011-02-03 16:38:32 -05:00
Jason Perkins
df2b2e3a6d Cleaned up and standardized namespaces in vstudio code 2011-02-02 13:27:52 -05:00
Jason Perkins
ad515a7ac3 Port VS200x from walksources() to trees 2011-01-22 14:51:54 -05:00
Jason Perkins
c9d4e88278 Add test to ensure path.join() can be called with a nil argument 2011-01-18 12:25:43 -05:00
Jason Perkins
1c06557bc9 Merged with stable 2011-01-02 15:53:26 -05:00
liamDevine
fb54aea2fa Removes the setting of WholeProgramOptimization for vs10 projects as per the msdn docs. 2010-12-30 15:40:12 +00:00
Jason Perkins
7fe1f9150c Merge with stable 2010-12-27 16:21:15 -05:00
Liam Devine
200f0d6c4b Sets ONLY_ACTIVE_ARCH = YES in Xcode debug builds to mirror Xcode created projects 2010-12-09 23:47:47 +00:00
Liam Devine
6a251c8577 adds GCC_SYMBOLS_PRIVATE_EXTERN = NO; which should be the default for builds. This fixes a Release build yet not Debug as Xcode itself is broken. Bug 2920784 and Feature 3118000 2010-12-09 23:08:54 +00:00
Jason Perkins
854aa65741 More SNC changes: fixed location of PCH to match VS, fixed flags 2010-12-06 06:45:22 -05:00
Jason Perkins
b8f2684004 Switched PS3 builds from GCC to SNC 2010-12-02 06:56:35 -05:00
Jason Perkins
8e469cf3a5 More stable/dev merging 2010-12-02 06:25:15 -05:00
Liam Devine
778c7b508f typo fix 2010-12-01 13:19:24 +00:00
Liam Devine
e4fb04b09c fixes ClCompile blocks with PCH's in Vs10 generator 2010-12-01 13:10:44 +00:00
liamDevine
83dbac114c Typo correction 2010-11-02 00:30:06 +00:00
liamDevine
1ba4125df5 adds NoIncrementalLink to vs200X 2010-11-02 00:08:25 +00:00
liamDevine
707729d408 removed dead tests
readded the behaviour that if cfg.kind is StaticLib then there is not LinkIncremental section
2010-11-01 23:30:15 +00:00
liamDevine
ecdf201d61 Vs10 implementing NoLinkIncrementally flag.
This changes the behaviour that was the previous.
Previously it could be set to true, false or omitted all together, now it is either true or false; was this wanted?
2010-11-01 22:30:31 +00:00
liamDevine
c2a22602c0 refactors optimise check to function premake.config.isoptimizedbuild(flags) which is not local scope as it can be used in other places
adds function premake.config.should_link_incrementally(cfg)
adds new flag NoIncrementalLink
2010-11-01 22:05:45 +00:00
liamDevine
ad5e8061c6 vs10 64bit builds can not use /ZI http://msdn.microsoft.com/en-us/library/958x11bc(v=VS.100).aspx 2010-11-01 02:20:35 +00:00
liamDevine
6e1e761fea fixes vs10 to only add a pdb when the symbols flag in used 2010-11-01 00:34:59 +00:00
liamDevine
67b3e45aa4 Fixes vs10 DebugInformationFormat 2010-11-01 00:26:24 +00:00
liamDevine
420e381d47 applies miminal rebuild change to vs10 that was applied in changeset 0b3e27b8eac6 for vs200x 2010-10-31 23:56:07 +00:00
liamDevine
6c7968aba6 adds local keyword to buffer instances 2010-10-31 23:24:15 +00:00
liamDevine
e89e0eb8e7 Fixes vs10 Bug 3100062 uses premake.config.isdebugbuild to determine debug status 2010-10-31 23:18:15 +00:00