Author: awy
Date: Thu Apr 24 08:29:15 2008
New Revision: 2339
URL: http://svn.slimdevices.com?rev=2339&root=Jive&view=rev
Log:
Linux x86_64
Modified:
7.1/trunk/squeezeplay/src/Makefile.linux
7.1/trunk/squeezeplay/src/luaexpat-1.0.2/config_include.linux
7.1/trunk/squeezeplay/src/luaprofiler-2.0/config
7.1/trunk/squeezeplay/src/squeezeplay/src/jive_debug.c
7.1/trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c
7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_timer.c
Modified: 7.1/trunk/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/Makefile.linux?rev=2339&root=Jive&r1=2338&r2=2339&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/Makefile.linux (original)
+++ 7.1/trunk/squeezeplay/src/Makefile.linux Thu Apr 24 08:29:15 2008
@@ -132,7 +132,7 @@
# just compile the library for to tolua++
.PHONY: tolua++
tolua++: lua
- cd tolua++-1.0.92/src/lib; ${CC} -shared -o libtolua++.so
-I../../include -I${PREFIX}/include *.c
+ cd tolua++-1.0.92/src/lib; ${CC} -shared -fPIC -o libtolua++.so
-I../../include -I${PREFIX}/include *.c
mkdir -p ${PREFIX}/lib
install tolua++-1.0.92/include/tolua++.h ${PREFIX}/include
install tolua++-1.0.92/src/lib/libtolua++.so ${PREFIX}/lib
Modified: 7.1/trunk/squeezeplay/src/luaexpat-1.0.2/config_include.linux
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/luaexpat-1.0.2/config_include.linux?rev=2339&root=Jive&r1=2338&r2=2339&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/luaexpat-1.0.2/config_include.linux (original)
+++ 7.1/trunk/squeezeplay/src/luaexpat-1.0.2/config_include.linux Thu Apr 24
08:29:15 2008
@@ -1,4 +1,4 @@
# OS dependent
-LIB_OPTION= -shared -L${PREFIX}/lib
+LIB_OPTION= -shared -fPIC -L${PREFIX}/lib
# Expat includes directory
EXPAT_INC= ${PREFIX}/include
Modified: 7.1/trunk/squeezeplay/src/luaprofiler-2.0/config
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/luaprofiler-2.0/config?rev=2339&root=Jive&r1=2338&r2=2339&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/luaprofiler-2.0/config (original)
+++ 7.1/trunk/squeezeplay/src/luaprofiler-2.0/config Thu Apr 24 08:29:15 2008
@@ -6,5 +6,5 @@
INCS= -I$(LUA_50_INCLUDE)
#WARN= -ansi -pedantic -W -Wall
EXTRA_LIBS=
-CFLAGS= -g3 -DTESTS $(WARN) $(INCS) -I./src
+CFLAGS= -fPIC -g3 -DTESTS $(WARN) $(INCS) -I./src
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/src/jive_debug.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/src/jive_debug.c?rev=2339&root=Jive&r1=2338&r2=2339&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/src/jive_debug.c (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/src/jive_debug.c Thu Apr 24 08:29:15
2008
@@ -23,7 +23,7 @@
clock_t ticks = clock();
- lua_pushlightuserdata(L, (char *)((unsigned int)L) + 1);
+ lua_pushlightuserdata(L, (char *)((unsigned long)L) + 1);
lua_gettable(L, LUA_REGISTRYINDEX);
hd = lua_touserdata(L, -1);
@@ -83,7 +83,7 @@
lua_sethook(L, perf_hook, LUA_MASKCALL | LUA_MASKRET, 0);
- lua_pushlightuserdata(L, (char *)((unsigned int)L) + 1);
+ lua_pushlightuserdata(L, (char *)((unsigned long)L) + 1);
hd = lua_newuserdata(L, sizeof(struct perf_hook_data));
lua_settable(L, LUA_REGISTRYINDEX);
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c?rev=2339&root=Jive&r1=2338&r2=2339&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c Thu Apr 24
08:29:15 2008
@@ -95,7 +95,7 @@
/* dns resolver thread */
static int dns_resolver_thread(void *p) {
- int fd = (int) p;
+ int fd = (long) p;
struct hostent *hostent;
struct in_addr **addr, byaddr;
char **alias;
@@ -198,7 +198,7 @@
return luaL_error(L, "socketpair failed: %s", strerror(r));
}
- u->t = SDL_CreateThread(dns_resolver_thread, (void *)(u->fd[1]));
+ u->t = SDL_CreateThread(dns_resolver_thread, (void *)(long)(u->fd[1]));
luaL_getmetatable(L, "jive.dns");
lua_setmetatable(L, -2);
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_timer.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_timer.c?rev=2339&root=Jive&r1=2338&r2=2339&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_timer.c (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_timer.c Thu Apr 24
08:29:15 2008
@@ -10,7 +10,7 @@
typedef struct {
SDL_TimerID timerId;
- int ref;
+ long ref;
bool once;
bool busy;
} TimerData;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
