Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing compilation errors for GNUstep build.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@889 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
dajt 2007-04-01 23:44:13 +00:00
parent 1a18ca735e
commit 98bbda198b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -1,6 +1,6 @@
include $(GNUSTEP_MAKEFILES)/common.make
CP = cp
vpath %.m src/SDL:src/Core:src/Core/JavaScript
vpath %.m src/SDL:src/Core:src/Core/JavaScript:src/Core/Scripting
vpath %.h src/SDL:src/Core
vpath %.c src/SDL:src/Core:src/BSDCompat
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)

6
src/Core/OOCollectionExtractors.m
View File

@ -23,7 +23,9 @@ MA 02110-1301, USA.
*/
#import "OOCollectionExtractors.h"
#ifdef GNUSTEP
#import <limits.h>
#endif
BOOL EvaluateAsBoolean(id object, BOOL defaultValue)
{
@ -539,4 +541,4 @@ BOOL EvaluateAsBoolean(id object, BOOL defaultValue)
return result;
}
@end
@end

6
src/Core/Scripting/OOJavaScriptEngine.m
View File

@ -42,8 +42,8 @@ static JSObject *xglob, *universeObj, *systemObj, *playerObj, *missionObj;
extern OOJSScript *currentOOJSScript;
OOINLINE inline jsval BOOLToJSVal(BOOL b) INLINE_CONST_FUNC;
OOINLINE inline jsval BOOLToJSVal(BOOL b)
OOINLINE jsval BOOLToJSVal(BOOL b) INLINE_CONST_FUNC;
OOINLINE jsval BOOLToJSVal(BOOL b)
{
return BOOLEAN_TO_JSVAL(b != NO);
}
@ -51,7 +51,7 @@ OOINLINE inline jsval BOOLToJSVal(BOOL b)
// For _bool scripting methods which always return @"YES" or @"NO" and nothing else.
OOINLINE jsval BooleanStringToJSVal(NSString *string) INLINE_PURE_FUNC;
OOINLINE inline jsval BooleanStringToJSVal(NSString *string)
OOINLINE jsval BooleanStringToJSVal(NSString *string)
{
return BOOLEAN_TO_JSVAL([string isEqualToString:@"YES"]);
}