Changeset 14


Ignore:
Timestamp:
Jan 12, 2006, 6:52:15 PM (15 years ago)
Author:
root
Message:

Update 2005-12-13

Location:
trunk
Files:
18 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Jamfile

    r7 r14  
    5151}
    5252
     53if $(OS) = BEOS
     54{
     55    BeOSBuild Transmission : libtransmission.a ;
     56}
     57
    5358SubInclude TOP libtransmission ;
  • trunk/Jamrules

    r7 r14  
    99VERSION_MINOR  = 4 ;
    1010# VERSION_STRING = $(VERSION_MAJOR).$(VERSION_MINOR) ;
    11 VERSION_STRING = CVS-20051124 ;
     11VERSION_STRING = CVS-20051213 ;
    1212
    1313DEFINES += VERSION_MAJOR=$(VERSION_MAJOR)
    1414           VERSION_MINOR=$(VERSION_MINOR)
    1515           VERSION_STRING=\\\"$(VERSION_STRING)\\\" ;
    16 OPTIM    = -O3 ;
     16OPTIM    = -O0 ;
    1717RM       = rm -Rf ;
    1818
     
    9494    }
    9595}
     96
     97if $(OS) = BEOS
     98{
     99    rule BeOSBuild
     100    {
     101        Depends     exe   : $(1) ;
     102        Depends     $(1)  : $(2) ;
     103        Clean     clean : $(1) beos/obj.$(CPU) ;
     104    }
     105    actions BeOSBuild
     106    {
     107        $(RM) $(1) && ( cd beos && make ) && \
     108          mv beos/obj.$(CPU)/Transmission $(1)
     109    }
     110}
  • trunk/configure

    r10 r14  
    125125    DEFINES="$DEFINES SYS_BEOS"
    126126
     127    CC="gcc"
     128    MACHINE=`uname -m`
     129    case $MACHINE in
     130      BePC) # BeOS on x86
     131        CPU="x86"
     132        ;;
     133      *)
     134        CPU="ppc"
     135        ;;
     136    esac
     137    SYSTEM="$SYSTEM / $CPU"
     138       
    127139    RELEASE=`uname -r`
    128140    case $RELEASE in
     
    138150      *)
    139151        echo "Unsupported BeOS version"
    140         exit 1 ;;
     152        exit 1
     153        ;;
    141154    esac
    142155    ;;
     
    206219EOF
    207220fi
     221if [ -n "$CPU" ]; then
     222cat >> config.jam << EOF
     223CPU        = $CPU ;
     224EOF
     225fi
    208226
    209227echo
  • trunk/libtransmission/Jamfile

    r3 r14  
    44    transmission.c bencode.c net.c tracker.c peer.c inout.c
    55    metainfo.c sha1.c utils.c upload.c fdlimit.c clients.c
    6     completion.c ;
     6    completion.c platform.c ;
    77
    88Library       libtransmission.a       : $(LIBTRANSMISSION_SRC) ;
  • trunk/libtransmission/transmission.c

    r7 r14  
    2323#include "transmission.h"
    2424
     25#ifdef __cplusplus
     26extern "C" {
     27#endif
     28
     29#include "platform.h"
     30
    2531/***********************************************************************
    2632 * Local prototypes
     
    6874    h->bindPort = TR_DEFAULT_PORT;
    6975
    70     snprintf( h->prefsDirectory, sizeof( h->prefsDirectory ),
    71               "%s/.transmission", getenv( "HOME" ) );
    72     mkdir( h->prefsDirectory, 0755 );
    73    
     76    tr_init_platform( h );
     77
    7478    return h;
    7579}
     
    489493
    490494#ifdef SYS_BEOS
     495        rename_thread(tor->thread, "torrent-tx");
    491496    /* This is required because on BeOS, SIGINT is sent to each thread,
    492497       which kills them not nicely */
     
    576581    return rateGeneric( tor->dates, tor->uploaded );
    577582}
     583
     584#ifdef __cplusplus
     585}
     586#endif
  • trunk/libtransmission/transmission.h

    r7 r14  
    2424#define TR_TRANSMISSION_H 1
    2525
     26#ifdef __cplusplus
     27extern "C" {
     28#endif
     29
    2630#include <inttypes.h>
    2731
    2832#define SHA_DIGEST_LENGTH    20
    29 #define MAX_PATH_LENGTH      1024
     33#ifdef SYS_BEOS
     34# include <StorageDefs.h>
     35# define MAX_PATH_LENGTH B_FILE_NAME_LENGTH
     36#else
     37# define MAX_PATH_LENGTH      1024
     38#endif
    3039#define TR_MAX_TORRENT_COUNT 50
    3140
     
    235244#endif
    236245
    237 #endif
     246#ifdef __cplusplus
     247}
     248#endif
     249
     250#endif
Note: See TracChangeset for help on using the changeset viewer.