From 9baea86e47df23aa83411e5cd5e4e900e408b311 Mon Sep 17 00:00:00 2001 From: "spartanj@gmail.com" Date: Wed, 26 Sep 2012 15:27:33 -0300 Subject: [PATCH] A couple of minor fixes for the Makefiles. --- Makefile | 2 +- Makefile.base | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e984b2bda..aaf0fb1cc 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ libeepp.a: $(FOBJHELPERS) $(FOBJMODULES) $(AR) $(ARFLAGS) $(LIBNAME) $(FOBJHELPERS) $(FOBJMODULES) $(DYLIB): $(FOBJHELPERS) $(FOBJMODULES) - $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(FOBJHELPERS) $(FOBJMODULES) $(LIBS) + $(CPP) $(LDFLAGS) $(DYLIB_EXTRA) -o $(LIBNAME) $(FOBJHELPERS) $(FOBJMODULES) $(LIBS) os: @echo $(BUILD_OS) diff --git a/Makefile.base b/Makefile.base index 7af23917c..246e978ee 100644 --- a/Makefile.base +++ b/Makefile.base @@ -93,7 +93,11 @@ endif ifneq (,$(findstring cygwin,$(BUILD_OS))) OSLIBEXTENSION = dll else - OSLIBEXTENSION = so + ifneq ($(BUILD_OS), darwin) + OSLIBEXTENSION = so + else + OSLIBEXTENSION = dylib + endif endif SDLCONFIGPATH = @@ -500,3 +504,9 @@ endif FOBJHELPERS = $(patsubst ./%, $(OBJDIR)%, $(OBJHELPERS) ) FOBJMODULES = $(patsubst ./%, $(OBJDIR)%, $(OBJMODULES) ) + +ifneq ($(BUILD_OS), darwin) + DYLIB_EXTRA = -Wl,-soname,$(LIB).$(VERSION) +else + DYLIB_EXTRA = -Wl +endif