@@ -107,7 +107,7 @@ IoObject *IoEditLine_readLine(IoEditLine *self, IoObject *locals, IoMessage *m) line = el_gets(DATA(self)->editline, &count); if (line && count >= 0) - return IOSEQ(line, (size_t)count); + return IOSEQ((const unsigned char *)line, (size_t)count); else return IONIL(self); } addons/EditLine/source/IoEditLine.c @@ -1,3 +1,9 @@ + +int __WindowsMacAddress(int a) // just to make ranlib happy +{ + return a + 1; +} + #ifdef WIN32 #ifndef _INC_WINDOWS addons/NetworkAdapter/source/WindowsMacAddress.c @@ -106,7 +106,7 @@ EventManager do( */ addEvent := method(e, descriptorId, eventType, timeout, //writeln("addEvent") - Coroutine currentCoroutine backTraceString + //writeln(Coroutine currentCoroutine backTraceString) //Exception raise("EventManager addEvent " .. e eventTypeName .. " - begin") //writeln("addEvent2") r := self realAddEvent(e, descriptorId, eventType, timeout) addons/Socket/io/A0_EventManager.io @@ -489,7 +489,7 @@ IoObject *IoSyslog_log(IoSyslog *self, IoObject *locals, IoMessage *m) return IONIL(self); } - syslog_write(CNUMBER((int)DATA(self)->priority), str); + syslog_write(CNUMBER((uintptr_t)DATA(self)->priority), str); return self; } addons/Syslog/source/IoSyslog.c @@ -137,7 +137,8 @@ IoObject *IoVorbisDspState_pcmout(IoVorbisDspState *self, IoObject *locals, IoMe *p++ = pcm[j][i]; IoObject* data = IOSEQ((const unsigned char*)sound, samples * sizeof(float) * 2); - int ret = vorbis_synthesis_read(DATA(self), samples); + //int ret = + vorbis_synthesis_read(DATA(self), samples); return data; } addons/Vorbis/source/IoVorbisDspState.c @@ -36,64 +36,34 @@ AddonBuilder := Object clone do( supportedOnPlatform := true - /* - - frameworkSearchPaths := List clone - frameworkSearchPaths append("/System/Library/Frameworks") - frameworkSearchPaths append("/Library/Frameworks") - frameworkSearchPaths append("/Local/Library/Frameworks") -// frameworkSearchPaths append("~/Library/Frameworks") - - searchPrefixes := List clone - searchPrefixes append(System installPrefix) - searchPrefixes append("/usr") - if(platform != "darwin", searchPrefixes append("/usr/X11R6")) - if(platform == "mingw", searchPrefixes append("/mingw")) - searchPrefixes append("/usr/local") - searchPrefixes append("/usr/pkg") - searchPrefixes append("/opt/local") - searchPrefixes append("/sw") - // on windows there is no such thing as a standard place - // to look for these things - searchPrefixes append("i:/io/addonLibs", "C:/io/addonLibs") - - headerSearchPaths := List clone - appendHeaderSearchPath := method(v, if(File clone setPath(v) exists, headerSearchPaths appendIfAbsent(v))) - searchPrefixes foreach(searchPrefix, appendHeaderSearchPath(searchPrefix .. "/include")) - - libSearchPaths := List clone - appendLibSearchPath := method(v, if(File clone setPath(v) exists, libSearchPaths appendIfAbsent(v))) - searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib")) -*/ - setupPaths := method( - - self frameworkSearchPaths := List clone - frameworkSearchPaths append("/System/Library/Frameworks") - frameworkSearchPaths append("/Library/Frameworks") - frameworkSearchPaths append("/Local/Library/Frameworks") - // frameworkSearchPaths append("~/Library/Frameworks") - - self searchPrefixes := List clone - searchPrefixes append(System installPrefix) - searchPrefixes append("/usr") - if(platform != "darwin", searchPrefixes append("/usr/X11R6")) - if(platform == "mingw", searchPrefixes append("/mingw")) - searchPrefixes append("/usr/local") - searchPrefixes append("/usr/pkg") - searchPrefixes append("/opt/local") - searchPrefixes append("/sw") - // on windows there is no such thing as a standard place - // to look for these things - searchPrefixes append("i:/io/addonLibs", "C:/io/addonLibs") - - self headerSearchPaths := List clone - self appendHeaderSearchPath := method(v, if(File clone setPath(v) exists, headerSearchPaths appendIfAbsent(v))) - searchPrefixes foreach(searchPrefix, appendHeaderSearchPath(searchPrefix .. "/include")) - - self libSearchPaths := List clone - self appendLibSearchPath := method(v, if(File clone setPath(v) exists, libSearchPaths appendIfAbsent(v))) - searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib")) + self frameworkSearchPaths := List clone + frameworkSearchPaths append("/System/Library/Frameworks") + frameworkSearchPaths append("/Library/Frameworks") + frameworkSearchPaths append("/Local/Library/Frameworks") + //frameworkSearchPaths append("~/Library/Frameworks") + + self searchPrefixes := List clone + + searchPrefixes append(System installPrefix) + searchPrefixes append("/opt/local") + searchPrefixes append("/usr") + if(platform != "darwin", searchPrefixes append("/usr/X11R6")) + if(platform == "mingw", searchPrefixes append("/mingw")) + searchPrefixes append("/usr/local") + searchPrefixes append("/usr/pkg") + searchPrefixes append("/sw") + // on windows there is no such thing as a standard place + // to look for these things + searchPrefixes append("i:/io/addonLibs", "C:/io/addonLibs") + + self headerSearchPaths := List clone + self appendHeaderSearchPath := method(v, if(File clone setPath(v) exists, headerSearchPaths appendIfAbsent(v))) + searchPrefixes foreach(searchPrefix, appendHeaderSearchPath(searchPrefix .. "/include")) + + self libSearchPaths := List clone + self appendLibSearchPath := method(v, if(File clone setPath(v) exists, libSearchPaths appendIfAbsent(v))) + searchPrefixes foreach(searchPrefix, appendLibSearchPath(searchPrefix .. "/lib")) ) debs := Map clone build/AddonBuilder.io 77420c9a5e46cdc7e78ccc0d08a7f982bd753c58 Steve Dekorte steve@StevesLaptop-7.local http://github.com/stevedekorte/io/commit/86d9bcc70abe8b4d92c1db3fafb28d5aab15a375 86d9bcc70abe8b4d92c1db3fafb28d5aab15a375 2009-10-27T17:51:39-07:00 2009-10-27T17:51:39-07:00 removed backtrace from EventManager, cleanup of some addon builds a9133127f205568b217433fba5fe36aa084dfc9a Steve Dekorte steve@StevesLaptop-7.local