Changeset 686:5d9713ead023 in roaraudio


Ignore:
Timestamp:
08/27/08 21:00:09 (16 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

moved libroar/midi.* to libroardsp/midi.*

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • include/libroar/libroar.h

    r588 r686  
    3232#include "meta.h" 
    3333#include "file.h" 
    34 #include "midi.h" 
    3534#include "acl.h" 
    3635 

  • include/libroardsp/libroardsp.h

    r685 r686  
    55 
    66#include <roaraudio.h> 
     7 
     8#include "midi.h" 
    79 
    810// defines 

  • include/libroardsp/midi.h

    r370 r686  
    44#define _LIBROARMIDI_H_ 
    55 
    6 #include "libroar.h" 
     6#include "libroardsp.h" 
    77#include <math.h> 
    88 

  • libroar/Makefile

    r590 r686  
    22 
    33TARGETS=libroar.so 
    4 OBJS=libroar.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o convert.o poly.o meta.o file.o midi.o acl.o vio.o 
     4OBJS=libroar.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o convert.o poly.o meta.o file.o acl.o vio.o 
    55 
    66#DEFINES        = -DDEBUG 
    77INCLUDE = -I../include -I../include/libroar 
    88CFLAGS  = -g -Wall -O2 $(DEFINES) $(INCLUDE) $(INCPATH) -fPIC 
    9 LDFLAGS = -g -shared $(LDPATH) $(lib_dnet) -lm 
     9LDFLAGS = -g -shared $(LDPATH) $(lib_dnet) 
    1010 
    1111all: ${TARGETS} 

  • libroardsp/Makefile

    r660 r686  
    33TARGETS=libroardsp.so 
    44OBJS=libroardsp.o filter.o filterchain.o 
     5OLDROAR=midi.o 
    56FILTER=lowp.o highp.o 
    67 
    … …  
    1617new: clean all 
    1718 
    18 libroardsp.so: ${OBJS} $(FILTER) 
    19         ${CC} ${LDFLAGS} -o libroardsp.so ${OBJS} $(FILTER) 
     19libroardsp.so: ${OBJS} $(FILTER) $(OLDROAR) 
     20        ${CC} ${LDFLAGS} -o libroardsp.so ${OBJS} $(FILTER) $(OLDROAR) 

  • libroardsp/midi.c

    r370 r686  
    11//midi.c: 
    22 
    3 #include "libroar.h" 
     3#include "libroardsp.h" 
    44 
    55struct { 
Note: See TracChangeset for help on using the changeset viewer.