mirror of
https://github.com/gnustep/apps-projectcenter.git
synced 2025-02-16 08:31:06 +00:00
Use ADDITIONAL_GUI_LIBS, not ADDITIONAL_LDFLAGS, to specify libraries to link
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@25767 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5821ef654c
commit
065115bbe3
2 changed files with 31 additions and 15 deletions
|
@ -1,3 +1,12 @@
|
|||
2007-12-20 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* PCMakefileFactory.m ([-createPreambleForProject:]): Output the
|
||||
-l flags in the ADDITIONAL_GUI_LIBS variable, not the
|
||||
ADDITIONAL_LDFLAGS one. This should fix linking applications on
|
||||
Windows, but will not work well for linking non-GUI libraries.
|
||||
ProjectCenter needs to be extended to allow specifying
|
||||
ADDITIONAL_TOOL_LIBS and ADDITIONAL_OBJC_LIBS on the gui.
|
||||
|
||||
2007-12-13 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* GNUmakefile.preamble (ADDITIONAL_LIB_DIRS): Improved linking to
|
||||
|
|
|
@ -139,21 +139,6 @@ static PCMakefileFactory *_factory = nil;
|
|||
[mfp appendString:
|
||||
[NSString stringWithFormat:@"ADDITIONAL_LDFLAGS += %@ ",
|
||||
[projectDict objectForKey:PCLinkerOptions]]];
|
||||
array = [projectDict objectForKey:PCLibraries];
|
||||
if (array && [array count])
|
||||
{
|
||||
NSString *tmp;
|
||||
NSEnumerator *enumerator = [array objectEnumerator];
|
||||
|
||||
while ((tmp = [enumerator nextObject]))
|
||||
{
|
||||
if (![tmp isEqualToString:@"gnustep-base"] &&
|
||||
![tmp isEqualToString:@"gnustep-gui"])
|
||||
{
|
||||
[mfp appendString:[NSString stringWithFormat:@"-l%@ ",tmp]];
|
||||
}
|
||||
}
|
||||
}
|
||||
[mfp appendString:@"\n\n"];
|
||||
|
||||
// Directories where to search headers
|
||||
|
@ -192,6 +177,28 @@ static PCMakefileFactory *_factory = nil;
|
|||
|
||||
// [mfp appendString:[projectDict objectForKey:PCLibraries]];
|
||||
|
||||
// Additional GUI libraries
|
||||
// TODO: Let the user select objc, base, gui libraries/frameworks
|
||||
// on the gui - the following works well for GUI stuff only.
|
||||
[mfp appendString:@"# Additional GUI libraries to link\n"];
|
||||
[mfp appendString: @"ADDITIONAL_GUI_LIBS += "];
|
||||
array = [projectDict objectForKey:PCLibraries];
|
||||
if (array && [array count])
|
||||
{
|
||||
NSString *tmp;
|
||||
NSEnumerator *enumerator = [array objectEnumerator];
|
||||
|
||||
while ((tmp = [enumerator nextObject]))
|
||||
{
|
||||
if (![tmp isEqualToString:@"gnustep-base"] &&
|
||||
![tmp isEqualToString:@"gnustep-gui"])
|
||||
{
|
||||
[mfp appendString:[NSString stringWithFormat:@"-l%@ ",tmp]];
|
||||
}
|
||||
}
|
||||
}
|
||||
[mfp appendString:@"\n\n"];
|
||||
|
||||
// Write the new file to disc!
|
||||
mfl = [projectPath stringByAppendingPathComponent:@"GNUmakefile.preamble"];
|
||||
if ([mfp writeToFile:mfl atomically:YES])
|
||||
|
|
Loading…
Reference in a new issue