From 6b1c438abfb5672823ec24868f6bbf38b3392afe Mon Sep 17 00:00:00 2001 From: Ralph Irving Date: Mon, 19 Aug 2019 23:07:34 +0000 Subject: [PATCH] Update MacOS Makefiles. Update squeezelite version to 1.9.5. Increase squeezelite revistion to 1192. --- Makefile.i386 | 25 +++++-------------------- Makefile.x86_64 | 24 ++++-------------------- squeezelite.h | 4 ++-- 3 files changed, 11 insertions(+), 42 deletions(-) diff --git a/Makefile.i386 b/Makefile.i386 index 76fe6604..6e588242 100644 --- a/Makefile.i386 +++ b/Makefile.i386 @@ -1,25 +1,10 @@ # OSX 10.5 Intel 32-bit -CC=gcc -CXX=g++ -CFLAGS ?= -Wall -fPIC -DRESAMPLE -DFFMPEG -DDSD -DLINKALL -O2 -I./include -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386 -LDFLAGS ?= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch i386 -mmacosx-version-min=10.5 -L./lib -lportaudio -lFLAC -lvorbisfile -lvorbis -logg -lmad -lfaad -lmpg123 -lsoxr -lavformat -lavcodec -lavutil -lpthread -ldl -lm -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -EXECUTABLE ?= squeezelite-i386 +OPTS = -DPORTAUDIO -DALAC -DOPUS -DRESAMPLE -DGPIO -DLINKALL -DVISEXPORT -DDSD -DUSE_SSL -I./include -I./include/opus -I./include/alac -O2 -I./include -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386 -SOURCES = main.c slimproto.c buffer.c stream.c utils.c output.c output_alsa.c output_pa.c output_stdout.c output_pack.c output_vis.c decode.c flac.c pcm.c mad.c vorbis.c faad.c mpg.c dsd.c dop.c dsd2pcm/dsd2pcm.c ffmpeg.c process.c resample.c +LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch i386 -mmacosx-version-min=10.5 -L./lib -DEPS = squeezelite.h slimproto.h dsd2pcm/dsd2pcm.h +LDADD = -lportaudio -lpthread -ldl -lm -framework CoreVideo -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -OBJECTS = $(SOURCES:.c=.o) +EXECUTABLE = squeezelite-i386 -all: $(EXECUTABLE) - -$(EXECUTABLE): $(OBJECTS) - $(CC) $(OBJECTS) $(LDFLAGS) -o $@ - -$(OBJECTS): $(DEPS) - -.c.o: - $(CC) $(CFLAGS) $< -c -o $@ - -clean: - rm -f $(OBJECTS) $(EXECUTABLE) +include Makefile diff --git a/Makefile.x86_64 b/Makefile.x86_64 index c1f2f9a8..0289a114 100644 --- a/Makefile.x86_64 +++ b/Makefile.x86_64 @@ -1,24 +1,8 @@ # OSX 10.7+ 64-bit only -CFLAGS ?= -Wall -fPIC -O2 $(OPTS) -I./include64 -DRESAMPLE -DFFMPEG -DOPUS -DDSD -DLINKALL -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -arch x86_64 -mmacosx-version-min=10.7 -LDFLAGS ?= -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -arch x86_64 -mmacosx-version-min=10.7 -L./lib64 -lportaudio -lFLAC -lvorbisfile -lvorbis -logg -lmad -lfaad -lmpg123 -lsoxr -lopus -lopusfile -lavformat -lavcodec -lavutil -lpthread -ldl -lm -framework CoreVideo -framework VideoDecodeAcceleration -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -EXECUTABLE ?= squeezelite-x86_64 +OPTS = -DPORTAUDIO -DALAC -DOPUS -DRESAMPLE -DGPIO -DLINKALL -DVISEXPORT -DDSD -DUSE_SSL -I./include64 -I./include64/opus -I./include64/alac -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -arch x86_64 -mmacosx-version-min=10.7 -SOURCES = main.c slimproto.c buffer.c stream.c utils.c output.c output_alsa.c output_pa.c output_stdout.c output_pack.c output_vis.c decode.c flac.c pcm.c mad.c vorbis.c faad.c mpg.c dsd.c dop.c dsd2pcm/dsd2pcm.c ffmpeg.c opus.c process.c resample.c +LDFLAGS = -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -arch x86_64 -mmacosx-version-min=10.7 -L./lib64 -DEPS = squeezelite.h slimproto.h dsd2pcm/dsd2pcm.h - -OBJECTS = $(SOURCES:.c=.o) - -all: $(EXECUTABLE) - -$(EXECUTABLE): $(OBJECTS) - $(CC) $(OBJECTS) $(LDFLAGS) -o $@ - -$(OBJECTS): $(DEPS) - -.c.o: - $(CC) $(CFLAGS) $< -c -o $@ - -clean: - rm -f $(OBJECTS) $(EXECUTABLE) +LDADD = -lportaudio -lpthread -ldl -lm -framework CoreVideo -framework VideoDecodeAcceleration -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon +include Makefile diff --git a/squeezelite.h b/squeezelite.h index 0b480da0..90b80d01 100644 --- a/squeezelite.h +++ b/squeezelite.h @@ -25,8 +25,8 @@ // make may define: PORTAUDIO, SELFPIPE, RESAMPLE, RESAMPLE_MP, VISEXPORT, GPIO, IR, DSD, LINKALL to influence build #define MAJOR_VERSION "1.9" -#define MINOR_VERSION "4" -#define MICRO_VERSION "1190" +#define MINOR_VERSION "5" +#define MICRO_VERSION "1192" #if defined(CUSTOM_VERSION) #define VERSION "v" MAJOR_VERSION "." MINOR_VERSION "-" MICRO_VERSION STR(CUSTOM_VERSION)