From 8e46a5e53ea6635d7522a16584f4abb9331f92a7 Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Thu, 25 Apr 2002 05:19:37 +0000
Subject: [PATCH] add tweaks for a Solaris build

---
 src/flac/Makefile.lite    | 5 +++++
 src/libFLAC/Makefile.lite | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index cc8280be..cdce131d 100644
--- 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 f60cdc03..2e9aeefa 100644
--- 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 \