Changeset 5825:3e41991f9a62 in roaraudio
- Timestamp:
- 01/06/13 14:12:21 (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.inc
r5807 r5825 6 6 COMMON_VERSION = $(COMMON_V_MM).$(COMMON_V_REV) 7 7 COMMON_SOVERSION= 2 8 9 PKGDEFINES = -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)\""10 8 11 9 # libroar: -
configure
r5824 r5825 525 525 echo '#define ROAR_VERSION_COMMON_REAL1(a,b,c) ROAR_VERSION_COMMON_REAL0(a,b,c)' 526 526 echo '#define ROAR_VERSION_COMMON ROAR_VERSION_COMMON_REAL1(ROAR_VERSION_MAJOR, ROAR_VERSION_MINOR, ROAR_VERSION_REV)' 527 echo "#define ROAR_VERSION_DISTRIBUTION_STRING \"$DISTRIBUTION_VERSION_STRING\"" 527 528 echo "#define ROAR_BUILD_STAMP \"$BUILD_STAMP\"" 529 echo 530 echo "#define ROAR_DEV_VENDOR $DEV_VENDOR" 531 echo "#define ROAR_DEV_VENDOR_NAME \"$DEV_VENDOR_NAME\"" 532 echo "#define ROAR_DEV_VENDOR_STRING \"$DEV_VENDOR/$DEV_VENDOR_NAME\"" 528 533 echo 529 534 [ "$DEFAULT_RATE" = '' ] || echo "#define ROAR_RATE_DEFAULT $DEFAULT_RATE" -
libroar/Makefile
r5692 r5825 16 16 #DEFINES+= -D_LIBROAR_NOATTR_WARNINGS 17 17 INCLUDE = -I../include -I../include/libroar 18 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $( PKGDEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC)18 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) 19 19 LDFLAGS+= -g -Wall $(SHARED) $(LDPATH) 20 20 LIBS = $(LIBROAR_NS) -
libroar/serverinfo.c
r5823 r5825 116 116 #endif 117 117 118 if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) {119 ret->version = "libroar/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">";118 if ( ROAR_VERSION_DISTRIBUTION_STRING[0] == 0 ) { 119 ret->version = "libroar/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING ">"; 120 120 } else { 121 ret->version = "libroar/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")";121 ret->version = "libroar/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING "> (" ROAR_VERSION_DISTRIBUTION_STRING ")"; 122 122 } 123 123 #ifdef ROAR_HAVE_GETHOSTID -
roard/Makefile
r5744 r5825 17 17 #DEFINES = -DMONITOR_LATENCY 18 18 INCLUDE = -I../include -I./include 19 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $( PKGDEFINES) $(INCLUDE) $(INCPATH)19 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) 20 20 LDFLAGS += -g -Wall $(rdynamic) -L../lib/ $(LDPATH) 21 21 DRVLIBS = $(lib_esd) $(lib_ossaudio) $(lib_ao) $(lib_shout) $(pthread) $(lib_sndio) $(lib_rsound) $(lib_portaudio) $(lib_pablio) $(lib_asound) $(lib_winmm) $(lib_pulse_simple) $(lib_pulse) $(lib_jack) $(lib_artsc) -
roard/req.c
r5823 r5825 790 790 791 791 // the following if is optimized out by compiler. 792 if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) {793 info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">";792 if ( ROAR_VERSION_DISTRIBUTION_STRING[0] == 0 ) { 793 info.version = "roard/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING ">"; 794 794 } else { 795 info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")";795 info.version = "roard/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING "> (" ROAR_VERSION_DISTRIBUTION_STRING ")"; 796 796 } 797 797
Note: See TracChangeset
for help on using the changeset viewer.