Changeset 4652:bca0fa4eabf1 in roaraudio


Ignore:
Timestamp:
12/09/10 18:07:09 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added support for distri version string part

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • configure

    r4651 r4652  
    1717DEV_VENDOR_NAME='RoarAudio' 
    1818#-------- 
     19 
     20DISTRIBUTION_VERSION_STRING='' 
    1921 
    2022 
     
    254256   echo '--without-experimental      - Disable experimental code' 
    255257   echo 
     258   echo '--distribution-version-string STRING' 
     259   echo '                            - Sets distribution part of version string' 
     260   echo 
    256261   echo '--roard-cfreq FREQ          - Sets the cycle frequency of roard in Hz.' 
    257262   echo '--vorbis-bits BITS          - Sets bits per sample used by Vorbis code' 
     
    409414   NO_LISTEN=true 
    410415  ;; 
     416  '--distribution-version-string') 
     417   DISTRIBUTION_VERSION_STRING="$2" 
     418   shift; 
     419  ;; 
    411420  '--roard-cfreq') 
    412421   ROARD_CFREQ="$2" 
     
    10731082 echo "DEV_VENDOR_NAME=$DEV_VENDOR_NAME" 
    10741083 echo "DEV_VENDOR_STRING=$DEV_VENDOR/$DEV_VENDOR_NAME" 
     1084 echo "DISTRIBUTION_VERSION_STRING=$DISTRIBUTION_VERSION_STRING" 
    10751085 echo 
    10761086 echo "SHARED=$SHARED" 
  • roard/Makefile

    r4590 r4652  
    1616#DEFINES        = -DDEBUG 
    1717#DEFINES        = -DMONITOR_LATENCY 
    18 PKGDEFINES= -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\"" 
     18PKGDEFINES= -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\"" -DDISTRIBUTION_VERSION_STRING="\"$(DISTRIBUTION_VERSION_STRING)\"" 
    1919INCLUDE   = -I../include -I./include 
    2020CFLAGS   += -g -Wall -O2 $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH) 
  • roard/req.c

    r4621 r4652  
    595595   memset(&info, 0, sizeof(info)); 
    596596 
    597    info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">"; 
     597   // the following if is optimized out by compiler. 
     598   if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) { 
     599    info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">"; 
     600   } else { 
     601    info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")"; 
     602   } 
    598603 
    599604   if ( !!strcmp(g_config->location, CONF_DEF_STRING) ) 
Note: See TracChangeset for help on using the changeset viewer.