2
0
Эх сурвалжийг харах

add openal, fix some android platform conversions

cdoran2011 9 жил өмнө
parent
commit
90d8a5e3f0

BIN
engine/lib/openal/Android/x86_64/libopenal.so


+ 3 - 8
engine/source/platformAndroid/AndroidNet.cpp

@@ -40,11 +40,6 @@
 // IPX fixes from William Taysom.
 // IPX fixes from William Taysom.
 #define IPX_NODE_LEN 6
 #define IPX_NODE_LEN 6
 
 
-// for 10.2 compatability...
-#ifndef socklen_t
-#define socklen_t unsigned int
-#endif
-
 struct sockaddr_ipx
 struct sockaddr_ipx
 {
 {
    sa_family_t     sipx_family;
    sa_family_t     sipx_family;
@@ -438,7 +433,7 @@ void Net::process()
    PacketReceiveEvent receiveEvent;
    PacketReceiveEvent receiveEvent;
    for(;;)
    for(;;)
    {
    {
-      S32 addrLen = sizeof(sa);
+      socklen_t addrLen = sizeof(sa);
       S32 bytesRead = -1;
       S32 bytesRead = -1;
       if(udpSocket != InvalidSocket)
       if(udpSocket != InvalidSocket)
          bytesRead = recvfrom(udpSocket, (char *) receiveEvent.data,  MaxPacketDataSize, 0, &sa, &addrLen);
          bytesRead = recvfrom(udpSocket, (char *) receiveEvent.data,  MaxPacketDataSize, 0, &sa, &addrLen);
@@ -506,7 +501,7 @@ void Net::process()
             // see if it is now connected
             // see if it is now connected
             if (getsockopt(currentSock->fd, SOL_SOCKET, SO_ERROR,
             if (getsockopt(currentSock->fd, SOL_SOCKET, SO_ERROR,
                            &optval,
                            &optval,
-                           (S32*)&optlen) == -1)
+                           &optlen) == -1)
             {
             {
                Con::errorf("Error getting socket options: %s",  strerror(errno));
                Con::errorf("Error getting socket options: %s",  strerror(errno));
                notifyEvent.state = ConnectedNotifyEvent::ConnectFailed;
                notifyEvent.state = ConnectedNotifyEvent::ConnectFailed;
@@ -695,7 +690,7 @@ Net::Error Net::listen(NetSocket socket, S32 backlog)
 NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress)
 NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress)
 {
 {
    sockaddr_in socketAddress;
    sockaddr_in socketAddress;
-   S32 addrLen = sizeof(socketAddress);
+   socklen_t addrLen = sizeof(socketAddress);
 
 
    int retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress,  &addrLen);
    int retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress,  &addrLen);
    if(retVal != InvalidSocket)
    if(retVal != InvalidSocket)

+ 2 - 2
engine/source/platformAndroid/AndroidThread.cpp

@@ -133,12 +133,12 @@ bool Thread::isAlive()
      return true; // we could not get the lock, it must be alive.
      return true; // we could not get the lock, it must be alive.
 }
 }
 
 
-U32 Thread::getId()
+ThreadIdent Thread::getId()
 {
 {
    return mData->mThreadID;
    return mData->mThreadID;
 }
 }
 
 
-U32 ThreadManager::getCurrentThreadId()
+ThreadIdent ThreadManager::getCurrentThreadId()
 {
 {
    return (U32)pthread_self();
    return (U32)pthread_self();
 }
 }