Changeset 5825:3e41991f9a62 in roaraudio for roard

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:

roard

Files:

• Makefile (modified) (1 diff)
• req.c (modified) (1 diff)

roard/Makefile

@@ -17 +17 @@
 #DEFINES        = -DMONITOR_LATENCY
 INCLUDE   = -I../include -I./include
-CFLAGS   += -g -Wall $(OPTI_O) $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH)
+CFLAGS   += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH)
 LDFLAGS  += -g -Wall $(rdynamic) -L../lib/ $(LDPATH)
 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

@@ -790 +790 @@
 
    // the following if is optimized out by compiler.
-   if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) {
-    info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">";
+   if ( ROAR_VERSION_DISTRIBUTION_STRING[0] == 0 ) {
+    info.version = "roard/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING ">";
    } else {
-    info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")";
+    info.version = "roard/" ROAR_VERSION_STRING " <" ROAR_DEV_VENDOR_STRING "> (" ROAR_VERSION_DISTRIBUTION_STRING ")";
    }