From d684f59787c36c76f122b84cb606cc81ff791113 Mon Sep 17 00:00:00 2001 From: rfm Date: Wed, 8 Feb 2006 07:57:07 +0000 Subject: [PATCH] ignore framework version on windows ... not supported git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22448 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 2 ++ Source/NSBundle.m | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3dc890a4d..fe0604e6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * Source/GSFileHandle.m: ([-availabledata])a fix logic of non-blocking I/O setting. + * Source/NSBundle.m: ([-pathForResource:ofType:inDirectory:]) + ignore versioning on windows. 2006-02-05 Richard Frith-Macdonald diff --git a/Source/NSBundle.m b/Source/NSBundle.m index be1dfc75d..4ba2a4ab3 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -1315,10 +1315,12 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) { NSString *rootPath; +#if !defined(__MINGW32__) if (_frameworkVersion) rootPath = [NSString stringWithFormat:@"%@/Versions/%@", [self bundlePath], _frameworkVersion]; else +#endif rootPath = [self bundlePath]; return [NSBundle pathForResource: name