built most products on nicolai

GRIS-UdeM · Oct 25, 2016 · 58a2ae6 · 58a2ae6
1 parent 9149732
commit 58a2ae6
Show file tree

Hide file tree

Showing 122 changed files with 378,448 additions and 18 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/common/.DS_Store b/common/.DS_Store
diff --git a/common/JackLibSampleRateResampler.h b/common/JackLibSampleRateResampler.h
@@ -21,7 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackLibSampleRateResampler__
 
 #include "JackResampler.h"
-#include <samplerate.h>
+#include "samplerate/samplerate.h"
 
 namespace Jack
 {

diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp
@@ -134,9 +134,10 @@ extern "C"
     #define LOG_LEVEL_INFO   1
     #define LOG_LEVEL_ERROR  2
 
-    LIB_EXPORT void jack_error(const char *fmt, ...);
-    LIB_EXPORT void jack_info(const char *fmt, ...);
-    LIB_EXPORT void jack_log(const char *fmt, ...);
+//    LIB_EXPORT void jack_error(const char *fmt, ...);
+//    LIB_EXPORT void jack_info(const char *fmt, ...);
+//    LIB_EXPORT void jack_log(const char *fmt, ...);
+
 
 #ifdef __cplusplus
 }
@@ -1228,23 +1229,46 @@ static void jack_format_and_log(int level, const char *prefix, const char *fmt,
     }
 }
 
-LIB_EXPORT void jack_error(const char *fmt, ...)
+//LIB_EXPORT void jack_error(const char *fmt, ...)
+//{
+//    va_list ap;
+//    va_start(ap, fmt);
+//    jack_format_and_log(LOG_LEVEL_INFO, "Jack: ", fmt, ap);
+//    va_end(ap);
+//}
+//
+//LIB_EXPORT void jack_info(const char *fmt, ...)
+//{
+//    va_list ap;
+//    va_start(ap, fmt);
+//    jack_format_and_log(LOG_LEVEL_INFO, "Jack: ", fmt, ap);
+//    va_end(ap);
+//}
+//
+//LIB_EXPORT void jack_log(const char *fmt, ...)
+//{
+//    va_list ap;
+//    va_start(ap, fmt);
+//    jack_format_and_log(LOG_LEVEL_INFO, "Jack: ", fmt, ap);
+//    va_end(ap);
+//}
+SERVER_EXPORT void jack_error(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
     jack_format_and_log(LOG_LEVEL_INFO, "Jack: ", fmt, ap);
     va_end(ap);
 }
 
-LIB_EXPORT void jack_info(const char *fmt, ...)
+SERVER_EXPORT void jack_info(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
     jack_format_and_log(LOG_LEVEL_INFO, "Jack: ", fmt, ap);
     va_end(ap);
 }
 
-LIB_EXPORT void jack_log(const char *fmt, ...)
+SERVER_EXPORT void jack_log(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);

diff --git a/common/jack/.DS_Store b/common/jack/.DS_Store
diff --git a/common/jack/samplerate/Makefile.am b/common/jack/samplerate/Makefile.am
@@ -0,0 +1,39 @@
+# This file was automatically generated from the Makefile.am
+# DO NOT EDIT!
+
+lib_LTLIBRARIES = libsamplerate.la
+include_HEADERS = samplerate.h
+
+EXTRA_DIST = config.h.in Version_script.in check_asm.sh
+CLEANFILES = src_sinc.s
+
+COEFF_HDRS = fastest_coeffs.h mid_qual_coeffs.h high_qual_coeffs.h
+
+
+noinst_HEADERS = common.h float_cast.h $(COEFF_HDRS)
+
+SRC_SOURCES = samplerate.c src_sinc.c $(COEFF_HDRS) src_zoh.c src_linear.c
+
+# MinGW requires -no-undefined if a DLL is to be built.
+libsamplerate_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
+libsamplerate_la_SOURCES = $(SRC_SOURCES) $(noinst_HEADERS)
+libsamplerate_la_LIBADD  = -lm
+
+#-------------------------------------------------------------------------------
+# An extra check for bad asm.
+
+check-asm : check_asm.sh src_sinc.s src_linear.s src_zoh.s
+	@echo
+	@echo
+	$(srcdir)/check_asm.sh src_sinc.s
+	$(srcdir)/check_asm.sh src_linear.s
+	$(srcdir)/check_asm.sh src_zoh.s
+	@echo
+	@echo
+
+%.s : $(srcdir)/%.c
+	$(CC) -S $(CFLAGS) $(DEFAULT_INCLUDES) $(srcdir)/$+ -o $@
+
+# Disable autoheader.
+AUTOHEADER=echo
+