building from trunk failed

[JensAyton]

I’m not in a position to test it at the moment, but r3328 attempts to fix both problems.

[rion]

unfortnatelly it still won't compile

but with next patch everything seems to be fine

Code: Select all

diff -ur oolite-dev-source-9999.orig/src/Core/NSNumberOOExtensions.m oolite-dev-source-9999/src/Core/NSNumberOOExtensions.m
--- oolite-dev-source-9999.orig/src/Core/NSNumberOOExtensions.m	2010-05-14 13:04:30.250236905 +0600
+++ oolite-dev-source-9999/src/Core/NSNumberOOExtensions.m	2010-05-14 13:15:18.726987552 +0600
@@ -73,7 +73,7 @@
 @end
 
 
-#if OOLITE_GNUSTEP && OOLITE_GNUSTEP_1_20
+#if OOLITE_GNUSTEP && OOLITE_GNUSTEP_1_20 == 0
 
 /*	As an optimization, we override the implementation on NSBoolNumber to
 	always return YES. In practical terms, we could always return NO in
diff -ur oolite-dev-source-9999.orig/src/Core/Universe.m oolite-dev-source-9999/src/Core/Universe.m
--- oolite-dev-source-9999.orig/src/Core/Universe.m	2010-05-14 13:04:30.264236785 +0600
+++ oolite-dev-source-9999/src/Core/Universe.m	2010-05-14 13:06:42.357237011 +0600
@@ -194,7 +194,7 @@
 @end
 
 
-#if __OBJC2__
+#if __OBJC2__ || OOLITE_GNUSTEP_1_20
 #import <objc/runtime.h>
 #else
 #if OOLITE_MAC_OS_X

thanks

[JensAyton]

D’oh.

I’ve now deleted that particular hack completely. It was bad form anyway.

[rion]

I’ve now deleted that particular hack completely. It was bad form anyway.

and what about second part of patch?

Code: Select all

diff -ur oolite-dev-source-9999.orig/src/Core/Universe.m oolite-dev-source-9999/src/Core/Universe.m
--- oolite-dev-source-9999.orig/src/Core/Universe.m   2010-05-14 13:04:30.264236785 +0600
+++ oolite-dev-source-9999/src/Core/Universe.m   2010-05-14 13:06:42.357237011 +0600
@@ -194,7 +194,7 @@
 @end
 
 
-#if __OBJC2__
+#if __OBJC2__ || OOLITE_GNUSTEP_1_20
 #import <objc/runtime.h>
 #else
 #if OOLITE_MAC_OS_X

and during compilation i see warnings like

Code: Select all

src/Core/Universe.m:198:25: warning: objc/runtime.h: no such file or directory

[JensAyton]

Hrm, thought I’d already done that bit. Apparently not. Shouldn’t it be:

Code: Select all

#if __OBJC2__
#import <objc/runtime.h>
#else
#if OOLITE_MAC_OS_X
#import <objc/objc-class.h>
#endif
#if !OOLITE_GNUSTEP_1_20
OOINLINE size_t class_getInstanceSize(Class cls)
{
    return cls->instance_size;
}
#endif
#endif

That said, I don't think the size dumping code is useful any longer, so I’m going to rip that out too.

[rion]

thanks, now its compilable w/o patches, but warning introduced by fixes is still here

Code: Select all

src/Core/Entities/Entity.m:48:25: warning: objc/runtime.h: no such file or directory

suggested fix

Code: Select all

#if !OOLITE_GNUSTEP_1_20

removes warning

[JensAyton]

Oops, I’d forgotten that that stuff was in two different places. No wonder I was confused…