Unconstrained VBR no longer attempt to hit an average rate

[opus.git] / Makefile.draft

diff --git a/Makefile.draft b/Makefile.draft
index 4fb6d0e..440118b 100644 (file)
--- a/Makefile.draft
+++ b/Makefile.draft
@@ -20,7 +20,7 @@ CFLAGS := -Drestrict= $(CFLAGS)
 
 ###################### END OF OPTIONS ######################
 
-CFLAGS += -DOPUS_VERSION='"0.9.6"'
+CFLAGS += -DOPUS_VERSION='"0.9.14"'
 include silk_sources.mk
 include celt_sources.mk
 include opus_sources.mk
@@ -36,8 +36,7 @@ LIBPREFIX = lib
 LIBSUFFIX = .a
 OBJSUFFIX = .o
 
-CC     = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
-CXX    = $(TOOLCHAIN_PREFIX)g++$(TOOLCHAIN_SUFFIX)
+CC     = $(TOOLCHAIN_PREFIX)cc$(TOOLCHAIN_SUFFIX)
 AR     = $(TOOLCHAIN_PREFIX)ar
 RANLIB = $(TOOLCHAIN_PREFIX)ranlib
 CP     = $(TOOLCHAIN_PREFIX)cp
@@ -54,20 +53,20 @@ CFLAGS += -DFIXED_POINT=1 -DDISABLE_FLOAT_API
 endif
 
 CINCLUDES += include/ \
-        silk/ \
-        silk/float/ \
-        silk/fixed/ \
+       silk/ \
+       silk/float/ \
+       silk/fixed/ \
        celt/ \
        src/
 
 # VPATH e.g. VPATH = src:../headers
 VPATH = ./ \
-        silk/interface \
-        silk/src_FIX \
-        silk/src_FLP \
-        silk/src_SigProc_FIX \
-        silk/src_SigProc_FLP \
-        test
+       silk/interface \
+       silk/src_FIX \
+       silk/src_FLP \
+       silk/src_SigProc_FIX \
+       silk/src_SigProc_FLP \
+       test
 
 LIBS = m
 
@@ -79,7 +78,6 @@ LDFLAGS += $(call ldflags-from-ldlibdirs,$(LDLIBDIRS))
 LDLIBS  += $(call ldlibs-from-libs,$(LIBS))
 
 COMPILE.c.cmdline   = $(CC) -c $(CFLAGS) -o $@ $<
-COMPILE.cpp.cmdline = $(CXX) -c $(CFLAGS) -o $@ $<
 LINK.o              = $(CC) $(LDPREFLAGS) $(LDFLAGS)
 LINK.o.cmdline      = $(LINK.o) $^ $(LDLIBS) -o $@$(EXESUFFIX)
 
@@ -120,9 +118,9 @@ $(TARGET): $(OBJS)
 
 opus_demo$(EXESUFFIX): $(OPUSDEMO_OBJS) $(TARGET)
        $(LINK.o.cmdline)
-       
+
 opus_compare$(EXESUFFIX): $(OPUSCOMPARE_OBJS)
        $(LINK.o.cmdline)
-       
+
 clean:
        rm -f opus_demo$(EXESUFFIX) opus_compare$(EXESUFFIX) $(TARGET) $(OBJS) $(OPUSDEMO_OBJS)