Commit Graph

592 Commits

Author SHA1 Message Date
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
Jason Perkins
b2e7af94cf Replaced host.windowsversion with os.getversion 2011-03-26 17:12:10 -04: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
8e538baa6d Fixed Windows version fetching to build under VS2008 2011-03-25 16:17:34 -04: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
907f57d636 Updated changelog for previous fix 2011-03-23 16:45:48 -04:00
Jason Perkins
7b0636f999 [#3232160] Environment variables are cut off 2011-03-23 16:38:40 -04:00
Liam Devine
ed13aaeacf removed temp print statement 2011-03-23 15:42:36 +00: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
48fdd10f4d renamed host.is_64bit to host.is64bit
renamed host.windows_version to host.windowsversion
2011-03-12 21:11:59 +00:00
Liam Devine
c68dd29153 added host.windows_version 2011-03-12 17:42:49 +00:00
Liam Devine
a8d274d397 did not do a diff on premake.lua and instead used code from another download, In other words I messed it up. 2011-03-12 17:09:55 +00:00
Liam Devine
ecd8d1ae34 added define _CRT_SECURE_NO_DEPRECATE for visual studio build in premake4.lua. Old versions of vs2005 use this define.
added host.c for detecting if the process is running under wow, uses code provided on msdn where we lookup the function at runtime, which fails gracefully if a 32 bit machine.
add host.is_64bit function in host.lua
2011-03-12 17:03:10 +00:00
Liam Devine
33b9dfe543 Xcode4 workspace working yet using Xcode3 generation and settings 2011-03-11 17:13:51 +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
02aa571d53 Removed spurious console messages from usages code 2011-01-18 13:08:43 -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
b116d76cbb Bug 3138377: Link dependencies ignored within "SharedLib" configuration 2011-01-04 06:23:26 -05:00
Jason Perkins
1c06557bc9 Merged with stable 2011-01-02 15:53:26 -05:00
Jason Perkins
d199b951fb Updated copyright date 2011-01-02 15:46:43 -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
Jason Perkins
80cb617918 Removed scripts.c from the repository 2010-12-23 14:06:11 -05:00
Jason Perkins
92e55c4d9b Removed Windows and OS X specific stuff from new SNC tool definition 2010-12-15 06:53:16 -05:00
Jason Perkins
4c5a0a1057 Properly pass return codes back to shell in release builds 2010-12-12 17:49:17 -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
Jason Perkins
68303c0400 Merged with latest premake-stable 2010-12-02 06:23:23 -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
Jason Perkins
8ffff2a7fd Added tag 4.3 for changeset 582630d7b7d4 2010-11-16 06:25:48 -05:00
Jason Perkins
1b8a1608ac 4.3 release prep 2010-11-16 06:25:37 -05:00
Jason Perkins
763568521b Added tag 4.3-rc2 for changeset 1dd035de5b6d 2010-11-02 20:17:32 -04:00
Jason Perkins
37f75f4330 Improved automated release script 2010-11-02 20:17:01 -04:00