Skip to content

Commit

Permalink
Update MacOS Makefiles.
Browse files Browse the repository at this point in the history
Update squeezelite version to 1.9.5.
Increase squeezelite revistion to 1192.
  • Loading branch information
ralph-irving committed Aug 19, 2019
1 parent 1784daf commit 6b1c438
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 42 deletions.
25 changes: 5 additions & 20 deletions Makefile.i386
Original file line number Diff line number Diff line change
@@ -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
24 changes: 4 additions & 20 deletions Makefile.x86_64
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions squeezelite.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6b1c438

Please sign in to comment.