mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
General mingw improvements
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22261 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
23d5a370a8
commit
bcd2a93d27
5 changed files with 1772 additions and 3019 deletions
|
@ -83,8 +83,8 @@
|
|||
#include <stdio.h>
|
||||
|
||||
/* The global configuration file. The real value is read from config.h */
|
||||
#ifndef GNUSTEP_CONFIG_FILE
|
||||
# define GNUSTEP_CONFIG_FILE /etc/GNUstep/GNUstep.conf
|
||||
#ifndef GNUSTEP_TARGET_CONFIG_FILE
|
||||
# define GNUSTEP_TARGET_CONFIG_FILE "/etc/GNUstep/GNUstep.conf"
|
||||
#endif
|
||||
|
||||
static NSString *gnustep_target_cpu =
|
||||
|
@ -390,8 +390,7 @@ GNUstepConfig(NSDictionary *newConfig)
|
|||
if (file == nil)
|
||||
{
|
||||
fromEnvironment = NO;
|
||||
file = [NSString stringWithCString:
|
||||
STRINGIFY(GNUSTEP_CONFIG_FILE)];
|
||||
file = @GNUSTEP_TARGET_CONFIG_FILE;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -475,11 +474,8 @@ GNUstepConfig(NSDictionary *newConfig)
|
|||
*/
|
||||
if ([conf objectForKey: @"GNUSTEP_USER_CONFIG_FILE"] == nil)
|
||||
{
|
||||
NSString *tmp;
|
||||
|
||||
tmp = [NSString stringWithCString:\
|
||||
STRINGIFY(GNUSTEP_USER_CONFIG_FILE)];
|
||||
[conf setObject: tmp forKey: @"GNUSTEP_USER_CONFIG_FILE"];
|
||||
[conf setObject: @GNUSTEP_TARGET_USER_CONFIG_FILE
|
||||
forKey: @"GNUSTEP_USER_CONFIG_FILE"];
|
||||
}
|
||||
if (config != nil)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue