Commit Graph

955 Commits

Author SHA1 Message Date
Jason Perkins
6928b3c7bb Ported GMake Windows resource file handling, with per-configuration support 2012-06-22 09:27:03 -04:00
Jason Perkins
4b6daf8424 Make baked cfg.objdir absolute, to be consistent with other path fields 2012-06-20 18:16:46 -04:00
Jason Perkins
6ad4ec1506 Allow GCC to provide both system and architecture specific flags (instead of one or the other) 2012-06-20 16:15:45 -04:00
Jason Perkins
a651c0deea Improve handling of nested tokens 2012-06-20 15:40:19 -04:00
Jason Perkins
770dcdac48 Convert path tokens (i.e. targetdir) to project relative during expansion 2012-06-20 14:10:23 -04:00
Jason Perkins
808aa41177 Bug 1674173: Allow source files to have the same name 2012-06-19 15:58:16 -04:00
Jason Perkins
759c169b94 Port GMake file object lists, start work on per-configuration file lists 2012-06-15 18:42:10 -04:00
Jason Perkins
56f6fe1039 Ported GMake tests to new APIs 2012-06-14 16:30:48 -04:00
Jason Perkins
0550a3fa0f Ported GMake system-specific tool configurations 2012-06-14 15:55:46 -04:00
Jason Perkins
3153c7578f Ported make settings to new APIs 2012-06-13 18:29:51 -04:00
Jason Perkins
9855bc6483 Fix handling of relative libdirs in config.getlinks() 2012-06-13 17:13:52 -04:00
Jason Perkins
da4dbbc9de Ported GMake link step to new APIs 2012-06-13 15:21:22 -04:00
Jason Perkins
b9c09f6dd3 Added project references to VC 2008 to fix intermittent build failures 2012-06-12 18:16:14 -04:00
Jason Perkins
e45a6efbd4 Ported GMake PCH rules 2012-06-12 15:57:45 -04:00
Jason Perkins
e15d115bbd Fix a bug in configuration map pattern matching 2012-06-11 19:11:21 -04:00
Jason Perkins
019eb6eb39 Minimal changes for VS2012 support, from mopey's pull request 2012-06-08 15:07:49 -04:00
Jason Perkins
1fa3951541 Added external() to reference non-Premake generated project files 2012-06-07 16:46:36 -04:00
Jason Perkins
e926a49c28 Fixed backslash escaping in VS2008 dummy configurations 2012-06-06 14:56:08 -04:00
Jason Perkins
cab63d8b14 Prevent external linker lib dir flags from bleeding through to configuration lists 2012-06-06 11:09:58 -04:00
Jason Perkins
c1a793ae65 More changes to match VC2008 project defaults; avoid unnecessary changesets 2012-05-28 18:39:38 -04:00
Jason Perkins
17fecf2e3a Ported LDFLAGS to the new Gmake action 2012-05-24 16:47:31 -04:00
Jason Perkins
850dbb099d Can now map from a solution config which doesn't exist in the project 2012-05-23 16:34:28 -04:00
Jason Perkins
ef4e929f60 Fix architecture mismatch in VS2010 project configurations element 2012-05-23 14:28:14 -04:00
Jason Perkins
4d1ad673fd Apply removes first instead of last, to give projects a way to clear the slate of solution level settings 2012-05-22 16:24:53 -04:00
Jason Perkins
e9a81b6f86 When configuration settings overlap, give precedence to the later settings 2012-05-21 17:55:07 -04:00
Jason Perkins
bf65487655 More progress on nextgen GMake action 2012-05-17 20:41:28 -04:00
Jason Perkins
9659541013 Write all config/architecture pairs into VS2010 project configurations element to avoid missing configurations 2012-05-15 19:06:03 -04:00
Jason Perkins
cac52ce5d6 Tweaks to better match the default VS2008 project layout, avoid modifications on project save 2012-05-10 17:52:28 -04:00
Jason Perkins
5284f920f3 Finished porting solutions to next-gen GMake action 2012-05-08 18:08:42 -04:00
Jason Perkins
3da76a113f Project-level configurations no longer propagate up to solutions, require mapping instead 2012-05-08 15:37:12 -04:00
Jason Perkins
73146fa066 Disregard project configuration lists when iterating solution configurations 2012-05-08 14:09:07 -04:00
Jason Perkins
06ec00f1f4 Ported default config and help rule to new GMake action 2012-05-04 16:38:21 -04:00
Jason Perkins
7b14efeba7 Removed deprecated config.getuniqueobjdirs(); object directories are now part of up-front bake process 2012-05-01 17:04:26 -04:00
Jason Perkins
8c5924f705 Fixed project-lookup bug in project.getdependencies() 2012-05-01 15:34:28 -04:00
Jason Perkins
6a586ded76 Added stubs for GMake next-gen action 2012-04-30 16:42:03 -04:00
Jason Perkins
aded68ba8a Baking changes to support tokens in object directories 2012-04-26 09:26:44 -04:00
Jason Perkins
7675e057d2 Deep copy all object values, to allow unique per-target token expansions 2012-04-26 07:44:25 -04:00
Jason Perkins
391ec4eee6 Remove all configuration values from project; prevent top-level settings from bleeding through and causing side-effects at the config level 2012-04-25 19:10:37 -04:00
Jason Perkins
f19694fd9a Clear current project object when setting solution 2012-04-25 16:05:34 -04:00
Jason Perkins
69b0a076ac Removed old config map cache 2012-04-24 19:51:20 -04:00
Jason Perkins
591a6d09eb Moved all project baking logic into an upfront pass 2012-04-24 19:29:56 -04:00
Jason Perkins
b44817ebd7 Solution.bake() now returns a temporary result; does not overwrite original solution object 2012-04-24 16:57:02 -04:00
Jason Perkins
15662f30c9 oven.bake() now takes explicit basis object, no longer tries to set parent objects automatically 2012-04-24 16:36:52 -04:00
Jason Perkins
bfeb1e6906 Added solution.bakeall(), new entry point for full bake process 2012-04-24 16:13:30 -04:00
Jason Perkins
6bdcb86ece Can now expand cfg.objdir, file.basedir and file.path tokens 2012-04-23 18:18:31 -04:00
Jason Perkins
671fd97864 Ported most list fields to new register() API 2012-04-22 14:12:33 -04:00
Jason Perkins
e9687ed684 Patch 3305599: Add -Wextra to ExtraWarnings (ergosys) 2012-04-22 12:58:46 -04:00
Jason Perkins
10b8b373dd Ignore nil values in the new register() API 2012-04-20 18:29:23 -04:00
Jason Perkins
66585d36ae Fixed a project caching issue; performance is improved 2012-04-20 18:15:32 -04:00
Jason Perkins
0bbb323d0c Added support for basic token expansion; more work still needed 2012-04-20 16:08:42 -04:00
Jason Perkins
b930597f58 Enable token expansions on simple string fields 2012-04-18 15:15:56 -04:00
Jason Perkins
fb833f3122 Ported string fields to new register()-based API definitions 2012-04-17 14:33:47 -04:00
Jason Perkins
fad379b388 Merged in xpol/premake-dev-debugcommand (debugcommand for Visual Studio) 2012-04-17 14:14:58 -04:00
Jason Perkins
8f60b15942 Ported string fields to new register()-based API definitions 2012-04-16 19:31:08 -04:00
Jason Perkins
2cbab56592 A bit of consistency cleanup on the prior pull request 2012-04-16 18:24:35 -04:00
Jason Perkins
1e29737cd7 Merged in xpol/premake-dev (Add NoWarnings flags) 2012-04-16 18:17:49 -04:00
xpol
ef3a891d83 add debugcommand for vs*. 2012-04-16 10:09:35 +08:00
Jason Perkins
e73c1aeed3 Fix bug in configuration mapping when applied multiple maps 2012-04-14 13:16:49 -04:00
xpol
816eacf8be Revert the call to buildstepsblock() back to vs200x.buildstepsblock(). 2012-04-13 09:32:42 +08:00
Jason Perkins
5cc291c313 Configuration mapping now working in Visual Studio 2008+, for most cases 2012-04-12 20:31:10 -04:00
Jason Perkins
21c44e57fd Added project-level filtering for configuration maps 2012-04-11 18:56:17 -04:00
xpol
a708f3ad82 Refactor to the duplicated code on output warnings blocks. 2012-04-11 11:28:44 +08:00
Jason Perkins
8e326ff6f1 Fixes for key-array and the new api.register() path 2012-04-10 17:21:37 -04:00
xpol
bd16eaedeb Add NoWarnings flags for Visual Studo to disable warnings (Very usefull when managing 3rd libraries). 2012-04-10 18:03:31 +08:00
Jason Perkins
86984a87de Added import library support to Visual Studio 2010 C++ projects 2012-04-09 14:51:08 -04:00
Jason Perkins
a68aa47e5f Added new array API value type, and started support for new key-value handling 2012-04-05 20:02:53 -04:00
Jason Perkins
22266a995d Start of API system overhaul, in support of configuration mapping 2012-04-04 16:21:22 -04:00
Jason Perkins
38ae459803 Fixes for VC2010 custom build rule handling 2012-03-29 20:01:02 -04:00
Jason Perkins
a1a0afd327 Prevent single-child ".." folders from appearing at the top of the source tree; merge project.eachfile() into project.getsourcetree() 2012-03-27 19:52:48 -04:00
Jason Perkins
0b241993c2 Merged file configurations and nodes in source trees 2012-03-27 18:54:15 -04:00
Jason Perkins
07f000ecda Folders containing a single sub-folder are now trimmed from top of the source tree 2012-03-27 18:33:15 -04:00
Jason Perkins
e563517031 Fixed VC2010 "attempt to index local 'cfg'" error 2012-03-23 10:23:48 -04:00
Jason Perkins
ef032d52cc Handle case where a library is specified with a system extension and end quote 2012-03-22 19:37:51 -04:00
Jason Perkins
f8fa020d64 Only add extension to libraries if it doesn't already exist; handle ending quote, if present, when appending extension 2012-03-22 19:30:34 -04:00
Jason Perkins
cc0c541843 Move file configuration building out of iterator, into caching pre-loop 2012-03-21 16:21:46 -04:00
Jason Perkins
a1f9c7c376 Renamed file config fullpath to relpath; better matches corresponding abspath field, less confusing 2012-03-21 16:10:16 -04:00
Jason Perkins
a2aa2f83e1 path.isabsolute() now recognizes quoted shell variables 2012-03-19 18:57:45 -04:00
Jason Perkins
8436afcd24 Added VC2010 support for custom build rules 2012-03-19 18:47:34 -04:00
Jason Perkins
1195fc387c Fixed project reference paths in legacy VC2010 action 2012-03-18 18:12:53 -04:00
Jason Perkins
ff7065a239 Patch #3505901: Make VC2010 PCH behavior match VC200x 2012-03-18 17:53:19 -04:00
Jason Perkins
d90942b318 Implemented basic custom build rules for VC2008 2012-03-15 20:02:46 -04:00
Jason Perkins
f1f6304e9b Added support for file configurations to oven; full file configurations now available to actions 2012-03-14 18:20:01 -04:00
Jason Perkins
399739d012 Added buildrule() to the API 2012-03-12 19:51:10 -04:00
Jason Perkins
198a9896fb Configurations that have been excluded from all projects are no longer listed in the solution 2012-03-05 17:45:42 -05:00
Jason Perkins
b64395526d Fixed config.getlinks(), can now find sibling projects properly 2012-03-01 19:25:34 -05:00
Jason Perkins
36978f5063 GCC and SNC can now link object files directly 2012-02-29 16:05:45 -05:00
Jason Perkins
f4a10dec03 Fixed VC2010 linking to PS3 libraries 2012-02-28 18:09:12 -05:00
Jason Perkins
adb36bf3e1 Fixed SNC linking to static library projects 2012-02-28 17:14:28 -05:00
Jason Perkins
5761e86cb6 Ported GCC and SNC linker flag generation to new tool APIs 2012-02-28 16:15:46 -05:00
Jason Perkins
9377e7b415 Store the name of script in which a project is defined along with the project metadata 2012-02-28 12:12:05 -05:00
Jason Perkins
8529bb0ea9 Only truncate next-gen action identifiers if they actually end in "ng" 2012-02-27 16:35:32 -05:00
Jason Perkins
cd6852b896 Target base name now includes prefix; replaced magical "ng" suffix with explicit flag to make migration easier 2012-02-24 16:22:35 -05:00
Jason Perkins
91e69b35e1 Fixed handling of targetextension (was ignored) 2012-02-23 15:12:50 -05:00
Jason Perkins
79e84920bd VC200x resource compiler include paths are now project relative 2012-02-22 16:20:21 -05:00
Jason Perkins
e0a6ca727c Configurations and platforms may now be specified per-project 2012-02-19 12:31:20 -05:00
Jason Perkins
458dcb8cbb Added toolset() API to enable per-configuration tool selection 2012-02-16 19:51:14 -05:00
Jason Perkins
20598184fa Fixed bug that caused some per-configuration files to be missed 2012-02-15 11:53:00 -05:00
Jason Perkins
7350cc73dd Add per-configuration file lists for VC2010 2012-02-14 16:39:51 -05:00
Jason Perkins
dac18c990b Added per-configuration file lists for VC2008 2012-02-14 16:16:58 -05:00
Jason Perkins
9d8958a923 Standardized handling of file paths in API setters and removers 2012-02-13 18:50:38 -05:00
Jason Perkins
56d6701528 Added config.getfileconfig(), basis for per-configuration file and exclusion lists 2012-02-13 17:32:23 -05:00
Jason Perkins
309a76cb8a Improved extensibility of VC2010 generator 2012-02-12 16:08:27 -05:00
Jason Perkins
b88bf60036 Improved the extensibility of the VC2008 generator 2012-02-11 11:29:45 -05:00
Jason Perkins
fe00186ca3 Made VC200x compiler block easier for add-ons to extend with external toolsets 2012-02-11 08:18:19 -05:00
Jason Perkins
7c2736369f Xbox360 fixes for VS2010 2012-02-10 14:53:43 -05:00
Jason Perkins
8e8bf9e6d1 Make the allowed flags a simple list, for easier addition of custom flags 2012-02-06 17:39:53 -05:00
Jason Perkins
bbb70b9f18 Avoid writing empty AdditionalOptions to PS3 compiler blocks 2012-02-06 17:39:32 -05:00
Jason Perkins
c9786f2242 Configurations are now cached before action is called; performance 2012-02-03 16:03:46 -05:00
Jason Perkins
10f0798789 Remove…() now properly removes flags; fixed Visual Studio typecast warning in CoCreateGuid() 2012-02-02 18:09:02 -05:00
Jason Perkins
257487b2de Ported virtual paths to new platform API 2012-02-01 20:00:24 -05:00
Jason Perkins
7e5f16312a Completed VS2010 port to new platforms API 2012-02-01 19:05:13 -05:00
Jason Perkins
935015b805 Added last bits of VC2010 vcxproj 2012-01-31 19:57:03 -05:00
Jason Perkins
1fdc480339 Ported VC2010 project references 2012-01-31 19:54:33 -05:00
Jason Perkins
3230c3ea69 Ported VC2010 files 2012-01-31 19:31:50 -05:00
Jason Perkins
d7e850ef17 Added pattern matching to remove API 2012-01-30 16:48:35 -05:00
Jason Perkins
0747211b6c Added replace…() APIs (exact match only, no patterns yet) 2012-01-28 17:48:29 -05:00
Jason Perkins
8c4626b654 Ported VC2010 pre- and post-build events; more tests 2012-01-27 17:52:46 -05:00
Jason Perkins
69a28a1369 Ported VC2010 resource compiler and linker setting blocks 2012-01-27 16:29:41 -05:00
Jason Perkins
7d7d95e8f2 Ported VC2010 resource compiler block 2012-01-27 13:37:24 -05:00
Jason Perkins
a01df4bc83 Ported Visual Studio 2010 to new platforms, up to the compiler settings block 2012-01-26 20:40:39 -05:00
Jason Perkins
8438760242 Removed left-over debug.traceback() from project.lua, .hgcheck folder 2012-01-26 11:57:19 -05:00
Jason Perkins
36cf1d6f34 Fixed objdir bug caused by new path.join() from premake-stable 2012-01-25 16:27:07 -05:00
Jason Perkins
0d46fe4135 Merge with premake-dev 2012-01-25 16:10:59 -05:00
Jason Perkins
1e97713a26 Default path.translate() to Windows-style backslashes 2012-01-25 15:58:21 -05:00
Jason Perkins
5d5e199efe Ported VC200x C++ .user files to new platforms API 2012-01-24 19:27:18 -05:00
Jason Perkins
7f83f6d506 Fix some minor issues with release build 2012-01-23 11:47:48 -05:00
Jason Perkins
4e30af55b8 Removed sibling libraries from VC200x links, as Visual Studio includes them implicitly 2012-01-22 13:16:18 -05:00
Jason Perkins
bcbc7f4950 Added target action, operating environment to configuration building filters 2012-01-22 12:19:43 -05:00
Jason Perkins
283ecaeb45 Ported Visual Studio 2008 files element and supporting functions 2012-01-19 19:14:18 -05:00
Jason Perkins
e4d23a49bf Patch 3111264: Allow path.join() to accept any number of args 2012-01-19 15:28:24 -05:00
Jason Perkins
12b9c326d1 Ported remaining Visual Studio 2008 tool elements: MIDL, resources, Xbox 360 tools 2012-01-18 17:42:34 -05:00
Jason Perkins
761673005b Added some sanity tests for config linker information, to get things started 2012-01-18 16:26:05 -05:00
Jason Perkins
3f0f15942a Ported VCCompilerTool, VCLinkerTool, VCManifestTool and supporting function and tests to new platforms API 2012-01-17 19:04:46 -05:00
Jason Perkins
63a568dd3f Began implementation of Vc200x next-gen projects: header and configuration blocks 2012-01-13 17:19:46 -05:00
Jason Perkins
665ef8b86a Added new output function _x(), XML escapes all arguments before printing 2012-01-12 18:27:30 -05:00
Jason Perkins
8c9c451bdb Added new action "vs2008ng", implemented solutions using new platforms API 2012-01-12 16:59:15 -05:00
Jason Perkins
fa4813cf3b Port unique objects directory logic to the new platforms API 2012-01-11 16:30:59 -05:00
Jason Perkins
b1df4ff7ae Bug 3413866: Incorrect VS200x .csproj relative source paths 2012-01-09 15:35:28 -05:00
Jason Perkins
9749188cc4 Ported build target info logic to new platforms; added system() to API 2012-01-06 17:08:24 -05:00
Jason Perkins
ba36bd6834 Updated copyrights; added #ifdef around Objbase.h include 2012-01-05 14:15:27 -05:00
Jason Perkins
2baa0ce3ad Ported VS2008 .vcproj Platforms and Configuration blocks to new platforms API 2012-01-04 17:16:06 -05:00
Jason Perkins
8f8a1a989f Implemented new ProjectConfigurationPlatforms for VS2008, supporting the new platforms API 2012-01-04 16:15:36 -05:00
Jason Perkins
a4b2152e85 Removed dynamic loading of Ole32 on Windows (see patch #3456407) 2012-01-04 15:01:22 -05:00
Jason Perkins
5533461428 Implemented new SolutionConfigurationPlatforms handler for VS2008, supporting improved configurations 2012-01-03 17:08:22 -05:00
Jason Perkins
81ea63c877 Implement project.eachconfig(), to iterate through the new build configuration/platform pairs 2011-12-28 16:44:09 -05:00
Jason Perkins
12b033afc0 Merge with premake-dev 2011-12-21 16:19:54 -05:00
Jason Perkins
c18f49192f Patch 3463020: Add windres environment variable for makefiles (icebreaker) 2011-12-21 15:52:26 -05:00
Jason Perkins
522907cd4b Started a new, simpler baking API to support the platforms overhaul 2011-12-20 19:03:45 -05:00
Jason Perkins
2322e56d36 Bug 3410213: regression in xcode generation in 4.4 beta3 2011-12-20 14:59:26 -05:00
Jason Perkins
eeff5330eb Fix to previous commit; adds back missing platform identifier to VS2010 configs (h/t Richard Sim) 2011-12-15 14:14:26 -05:00
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
1350e205fd Patch 3440466: Fixed compiler warnings on Mac (Konstantin Tokarev) 2011-12-08 16:11:51 -05:00
Jason Perkins
2fde8a219a Fixed broken lib search path from last commit (h/t coh) 2011-12-08 15:46:16 -05:00
Jason Perkins
458d62ca36 Merge with Premake-dev 2011-12-07 16:10:27 -05:00
Jason Perkins
27269f826a Bug 3121217: Test suite fails on Linux x86_64: os.findlib broken 2011-12-07 16:05:35 -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
1b827d3847 Merged with premake-dev 2011-12-04 11:10:11 -05:00
Jason Perkins
ccb34aab78 Patch 3351583: _PREMAKE_COMMAND variable (Konstantin Tokarev) 2011-11-28 17:01:44 -05:00
Jason Perkins
b5d7bba342 Added debugformat, with C7 support for Visual Studio 2011-11-19 16:50:50 -05:00
Jason Perkins
1c679acae4 The error message for invalid flags now includes the offending value 2011-11-19 11:12:24 -05:00
Unknown
124a226b45 Added new global _WORKING_DIR 2011-11-13 17:19:10 -05:00
Jason Perkins
3a632cbfb1 Improved handling of linker defaults in VS2010 2011-11-13 15:07:31 -05:00
Unknown
90a71d8401 Added new global _WORKING_DIR 2011-11-13 17:19:10 -05:00
Jason Perkins
974468375b Patch 3429777: Support for DragonFly BSD (Joachim de Groot) and 3445049: Build fix for FreeBSD (Konstantin Tokarev) 2011-12-06 15:42:05 -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
2fef34701e Patch 3401184: Fix Gmake LDFLAGS generation order (Adam Petrone) 2011-10-26 15:54:52 -04:00
Jason Perkins
ac6867c35b Patch 3337372: Improved precompiled header support (Anders Ericsson) 2011-10-25 18:06:53 -04: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
562746c1f4 Patch 3138574: NoImportLib ignored in Windows makefiles dependencies (rjmyst3) 2011-10-03 14:53:14 -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
60e223cc4c ccf8e28247d6 changed the name of environmentargs to debugargs yet the call site for vs10 was not updated. Reported by Zao on IRC. 2011-09-08 14:01:47 +01:00
Jason Perkins
3e8ee40315 Added new function os.stat to fetch information about a file 2011-08-26 16:10:02 -04: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
Liam Devine
7d1207a7cf * Bug 3277343: SM_SERVERR2 is not always defined by default
Also maybe running under WoW
2011-08-23 12:50:08 +01:00
Jason Perkins
8f6fd68f7a Fixed #3381011: location breaks vpaths 2011-08-22 16:35:51 -04:00
liamDevine
75b488d63a * Bug 3277343: SM_SERVERR2 is not always defined by default
Also maybe running under WoW
2011-08-22 12:52:42 +01:00
liamDevine
7c3dfa82c7 First member of SYSTEM_INFO is a union. MSCV allows {}, codeblocks with mingw does not. Prevent warning on both by using {{0}} syntax. 2011-08-22 11:32:18 +01: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
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
53e7888a3d Removed block-commented code that was showing up in release builds 2011-07-25 13:58:40 -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
344e285003 Matched VS2010 indentation behavior (two spaces) 2011-07-05 15:03:36 -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
Jason Perkins
0e062eca0b Updated copyright on VS2010 at Liam's request 2011-05-03 19:16:51 -04: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
liamDevine
6c7b1939d8 ignore entry point in Manged C++ 2011-04-30 00:57:49 +01:00
liamDevine
df11537b80 Adding Managed C++ support for vs10 2011-04-30 00:25:12 +01:00
liamDevine
2f1e1809f5 vs10 reuses optimisation function 2011-04-29 23:52:41 +01:00
liamDevine
e5da7de916 merge with stable 2011-04-29 23:44:53 +01:00
liamDevine
5c015131c8 kind is a function in _G. Changed function 'merge' to use the string 'kind' instead of the function for the table key. 2011-04-29 22:56:36 +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
Jason Perkins
3737111c68 Some cleanup for is64bit() to make it look a bit like the other os functions 2011-04-04 16:49:55 -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
Jason Perkins
b2e7af94cf Replaced host.windowsversion with os.getversion 2011-03-26 17:12:10 -04: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
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
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
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
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
e4fb04b09c fixes ClCompile blocks with PCH's in Vs10 generator 2010-12-01 13:10:44 +00:00
liamDevine
1567e91f1d embed scripts 2010-11-02 00:31:37 +00:00
liamDevine
5fdc73ad0d uses premake.config.isoptimizedbuild instead of optimisation(cfg) CompOperator "Disabled" in vs10 2010-11-02 00:23:24 +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
ac8d017332 merge 2010-11-01 22:02:08 +00:00
liamDevine
910edfdc31 embed scripts 2010-11-01 02:42:37 +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
ed6fa01f91 embeds scripts 2010-11-01 00:39:39 +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
e89e0eb8e7 Fixes vs10 Bug 3100062 uses premake.config.isdebugbuild to determine debug status 2010-10-31 23:18:15 +00:00
liamDevine
ea39872952 refactors magic strings 2010-10-31 22:19:22 +00:00
liamDevine
2bc31165d0 Removed commented out code that was there to remind me of PCH support 2010-10-30 12:42:00 +01:00
liamDevine
7e1e211156 embeded scripts 2010-10-30 11:57:22 +01:00
liamDevine
3f0b545424 removes invalid test in vs2010 filters
refactored moving more code in the function "if_config_and_platform" for vs2010
added write_file_compile_block which takes care of pre compiled headers and fixes Bug 3095274
Did lines ending changes in vs2010_vcxproj.lua and test_vs2010_vcxproj.lua which is why the changeset is bigger??
2010-10-30 11:55:40 +01:00
liamDevine
51abe69396 removes invalid test in vs2010 filters
removes dead function vs10_helpers.table_of_filters
2010-10-30 01:16:33 +01:00
liamDevine
a51fc3da63 Bug 3097868: Patch 3076517 premake_rev465.patch. Removes relative paths from vs2010 filters (Robert Konrad) 2010-10-30 00:43:12 +01:00
Jason Perkins
2278e5256b Merged with Stable 2010-10-25 14:48:39 -04:00
Jason Perkins
9ec77bf550 Bug 3015312: Makefiles are not quoted correctly 2010-10-21 06:41:52 -04:00
Jason Perkins
6da5323224 Bug 3016050: {"../Dir/file1.c","../../Dir/file2.c"} breaks Xcode (Stephane) 2010-10-20 19:52:32 -04:00
Jason Perkins
e52f458c6c Bug 3020382: GCC PCH not working 2010-10-19 07:14:46 -04:00
Jason Perkins
4a515d8df6 Bug 3034222: StaticLib projects ignore linkoptions 2010-10-13 10:20:26 -04:00
Jason Perkins
c51666fc07 Bug 3035545: The pattern { "./folder/*.c" } matches no files 2010-10-13 06:45:06 -04:00
Jason Perkins
781f1cf792 Improved portability of Premake's Mac OS X binaries (William Burnson) 2010-10-11 12:25:55 -04:00
Jason Perkins
a83249ec49 Bug 2971841: Gmake escaping of shell variable $(...) is broken 2010-10-04 06:43:19 -04:00
Jason Perkins
6c5022bf39 Patch 3063804: Set CompileAs flag for VS200x C projects (rjmyst3) 2010-09-14 06:36:40 -04:00
Jason Perkins
683d391ae7 Bug 3007101: Generating PDB in Release builds is not supported 2010-09-05 16:10:28 -04:00
Jason Perkins
8e84aa4efe Bug 3056381: Xcode project breaks on special chars 2010-09-05 14:47:42 -04:00
Jason Perkins
ae8826e75e Removed timestamp from Xcode IDs to make them reproducible (Robert Konrad) 2010-09-02 17:32:25 -04:00
Jason Perkins
f4c7c883fc Removed timestamp from Xcode IDs to make reproducible (Robert Konrad) 2010-09-02 17:30:03 -04:00
Liam Devine
3499a39af8 Merged with fork 2010-08-31 03:32:01 +01:00