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

Linux fixes.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4075 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2011-01-15 18:08:49 +00:00
parent af8c6bc459
commit c02738ce19
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -70,7 +70,7 @@ else
endif
JS_IMPORT_LIBRARY = libjs.a
endif
ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
ADDITIONAL_OBJC_LIBS = $(LIBJS_BIN_DIR)/$(JS_IMPORT_LIBRARY) -lGLU -lGL -lX11
ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
ADDITIONAL_OBJCFLAGS = -Wall -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags`

4
src/Core/Scripting/OOJSEngineDebuggerHelpers.m
View File

@ -197,6 +197,7 @@ const char *JSStringToStrSafeDbg(JSString *str)
}
#if OO_NEW_JS
const char *JSIDToStrSafeDbg(jsid anID)
{
NSString *formatted = nil;
@ -213,7 +214,7 @@ const char *JSIDToStrSafeDbg(jsid anID)
const jschar *chars = NULL;
size_t length = JS_GetStringLength(string);
#if OO_NEW_JS && OOJS_FF4B9
#if OOJS_FF4B9
if (JS_StringHasBeenInterned(string))
{
chars = JS_GetInternedStringChars(string);
@ -235,5 +236,6 @@ const char *JSIDToStrSafeDbg(jsid anID)
return [formatted UTF8String];
}
#endif
#endif