gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the new GNUSTEP_IS_FLATTENED variable, and default to flattened if nothing better specified

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23719 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-10-02 16:06:37 +00:00
parent cfaf083d90
commit 6aec2db2f8
7 changed files with 58 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/GNUmakefile
View file

@ -62,7 +62,7 @@ ifeq ($(GNUSTEP_TARGET_OS), mingw32)
DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \
-DGNUSTEP_FLATTENED=\"$(GNUSTEP_FLATTENED)\" \
-DGNUSTEP_IS_FLATTENED=\"$(GNUSTEP_IS_FLATTENED)\" \
-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
@ -71,7 +71,7 @@ else
DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \
-DGNUSTEP_FLATTENED=\"$(GNUSTEP_FLATTENED)\" \
-DGNUSTEP_IS_FLATTENED=\"$(GNUSTEP_IS_FLATTENED)\" \
-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
endif

10
Source/NSPathUtilities.m
View file

@ -111,9 +111,9 @@ static NSString *library_combo =
#else
nil;
#endif
static NSString *gnustep_flattened =
#ifdef GNUSTEP_FLATTENED
@GNUSTEP_FLATTENED;
static NSString *gnustep_is_flattened =
#ifdef GNUSTEP_IS_FLATTENED
@GNUSTEP_IS_FLATTENED;
#else
nil;
#endif
@ -1647,7 +1647,7 @@ if (domainMask & mask) \
NSString *part = nil;
gslibsDir = [libraryDir stringByAppendingPathComponent: libsDir];
if ([gnustep_flattened boolValue] == NO
if ([gnustep_is_flattened boolValue] == NO
&& gnustep_target_cpu != nil && gnustep_target_os != nil)
{
part = [gnustep_target_cpu stringByAppendingPathComponent:
@ -1684,7 +1684,7 @@ if (domainMask & mask) \
NSString *full = nil;
NSString *part = nil;
if ([gnustep_flattened boolValue] == NO
if ([gnustep_is_flattened boolValue] == NO
&& gnustep_target_cpu != nil && gnustep_target_os != nil)
{
part = [gnustep_target_cpu stringByAppendingPathComponent: