add tweaks for a Solaris build

diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index cc8280bef0c4011a0ceb059ac4a462d3abea50b1..cdce131d6c9f301d6be66fe39f6923818f91f480 100644 (file)
--- a/src/flac/Makefile.lite
+++ b/src/flac/Makefile.lite
@@ -24,10 +24,15 @@ ifeq ($(DARWIN_BUILD),yes)
 INCLUDES     = -I./include -I../../include
 LIBS         = -lFLAC -lc -lm
 else
+ifeq ($(SOLARIS_BUILD),yes)
+INCLUDES     = -I./include -I../../include
+LIBS         = -lFLAC -lm
+else
 #@@@ TODO: conditionalize ogg includes, defines, and -logg
 INCLUDES     = -I./include -I../../include -I$(HOME)/local/include -DFLAC__HAS_OGG
 LIBS         = -lFLAC -lm -L$(HOME)/local/lib -logg
 endif
+endif
 
 OBJS = \
        analyze.o \

diff --git a/src/libFLAC/Makefile.lite b/src/libFLAC/Makefile.lite
index f60cdc03d9af2ac6e2efd77f009f82737e4e5579..2e9aeefaca034e83ecb5158e153de6538b8a474b 100644 (file)
--- a/src/libFLAC/Makefile.lite
+++ b/src/libFLAC/Makefile.lite
@@ -24,18 +24,25 @@ LIB_NAME  = libFLAC
 ifeq ($(DARWIN_BUILD),yes)
 DEFINES = -DFLAC__NO_NASM -DFLAC__ALIGN_MALLOC_DATA
 else
+ifeq ($(SOLARIS_BUILD),yes)
+DEFINES = -DFLAC__NO_NASM -DFLAC__ALIGN_MALLOC_DATA
+else
 DEFINES = -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA
 endif
+endif
 INCLUDES  = -I./include -I../../include
 DEBUG_CFLAGS = -DFLAC__OVERFLOW_DETECT
 
 ifeq ($(DARWIN_BUILD),yes)
 else
+ifeq ($(SOLARIS_BUILD),yes)
+else
 ASM_OBJS = \
        ia32/cpu_asm.o \
        ia32/fixed_asm.o \
        ia32/lpc_asm.o
 endif
+endif
 
 OBJS = $(ASM_OBJS) \
        bitbuffer.o \