Changeset 5825:3e41991f9a62 in roaraudio for libroar


Ignore:
Timestamp:
01/06/13 14:12:21 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

removed yet another set of -DXXX as well as $(PKGDEFINES). Updated configure to write some more stuff into config.h

Location:
libroar
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libroar/Makefile

    r5692 r5825  
    1616#DEFINES+= -D_LIBROAR_NOATTR_WARNINGS 
    1717INCLUDE = -I../include -I../include/libroar 
    18 CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) 
     18CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) 
    1919LDFLAGS+= -g -Wall $(SHARED) $(LDPATH) 
    2020LIBS    = $(LIBROAR_NS) 
  • libroar/serverinfo.c

    r5823 r5825  
    116116#endif 
    117117 
    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 ">"; 
    120120 } 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 ")"; 
    122122 } 
    123123#ifdef ROAR_HAVE_GETHOSTID 
Note: See TracChangeset for help on using the changeset viewer.