From 7325eff128911019593c214e1ed3b507b7ce6abf Mon Sep 17 00:00:00 2001 From: Maarten Gribnau Date: Thu, 7 Nov 2002 22:41:42 +0000 Subject: Added extra ranlib on libary files after being copied to the lib tree for OSX only. This saves other OSX developers the trouble of manually running ranlib. This is not a good solution (because I don't know the correct one) but it works. Maarten --- intern/bmfont/Makefile | 4 ++++ intern/bsp/Makefile | 4 ++++ intern/decimation/Makefile | 4 ++++ intern/ghost/Makefile | 4 ++++ intern/guardedalloc/Makefile | 4 ++++ intern/iksolver/Makefile | 4 ++++ intern/keymaker/Makefile | 3 +++ intern/moto/Makefile | 4 ++++ intern/string/Makefile | 4 ++++ 9 files changed, 35 insertions(+) diff --git a/intern/bmfont/Makefile b/intern/bmfont/Makefile index 0da2a844236..037a55601ad 100644 --- a/intern/bmfont/Makefile +++ b/intern/bmfont/Makefile @@ -48,5 +48,9 @@ install: all debug @[ -d $(NAN_BMFONT)/lib/debug ] || mkdir $(NAN_BMFONT)/lib/debug cp -f $(DIR)/libbmfont.a $(NAN_BMFONT)/lib/ cp -f $(DIR)/debug/libbmfont.a $(NAN_BMFONT)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_BMFONT)/lib/libbmfont.a + ranlib $(NAN_BMFONT)/lib/debug/libbmfont.a +endif cp -f *.h $(NAN_BMFONT)/include/ diff --git a/intern/bsp/Makefile b/intern/bsp/Makefile index 371c43c848a..5d96867e3b1 100644 --- a/intern/bsp/Makefile +++ b/intern/bsp/Makefile @@ -48,6 +48,10 @@ install: all debug @[ -d $(NAN_BSP)/lib/debug ] || mkdir $(NAN_BSP)/lib/debug cp -f $(DIR)/libbsp.a $(NAN_BSP)/lib/ cp -f $(DIR)/debug/libbsp.a $(NAN_BSP)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_BSP)/lib/libbsp.a + ranlib $(NAN_BSP)/lib/debug/libbsp.a +endif cp -f extern/*.h $(NAN_BSP)/include/ diff --git a/intern/decimation/Makefile b/intern/decimation/Makefile index f0d9567a618..60df8dd8b15 100644 --- a/intern/decimation/Makefile +++ b/intern/decimation/Makefile @@ -48,5 +48,9 @@ install: all debug @[ -d $(NAN_DECIMATION)/lib/debug ] || mkdir $(NAN_DECIMATION)/lib/debug cp -f $(DIR)/libdecimation.a $(NAN_DECIMATION)/lib/ cp -f $(DIR)/debug/libdecimation.a $(NAN_DECIMATION)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_DECIMATION)/lib/libdecimation.a + ranlib $(NAN_DECIMATION)/lib/debug/libdecimation.a +endif cp -f extern/*.h $(NAN_DECIMATION)/include/ diff --git a/intern/ghost/Makefile b/intern/ghost/Makefile index 5c78bea192c..bfcd2d2f12a 100644 --- a/intern/ghost/Makefile +++ b/intern/ghost/Makefile @@ -48,5 +48,9 @@ install: all debug @[ -d $(NAN_GHOST)/lib/debug ] || mkdir $(NAN_GHOST)/lib/debug cp -f $(DIR)/libghost.a $(NAN_GHOST)/lib/ cp -f $(DIR)/debug/libghost.a $(NAN_GHOST)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_GHOST)/lib/libghost.a + ranlib $(NAN_GHOST)/lib/debug/libghost.a +endif cp -f *.h $(NAN_GHOST)/include/ diff --git a/intern/guardedalloc/Makefile b/intern/guardedalloc/Makefile index 9957d8aa417..a63e9107cc8 100644 --- a/intern/guardedalloc/Makefile +++ b/intern/guardedalloc/Makefile @@ -48,5 +48,9 @@ install: all debug @[ -d $(NAN_GUARDEDALLOC)/lib/debug ] || mkdir $(NAN_GUARDEDALLOC)/lib/debug cp -f $(DIR)/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/ cp -f $(DIR)/debug/libguardedalloc.a $(NAN_GUARDEDALLOC)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a + ranlib $(NAN_GUARDEDALLOC)/lib/debug/libguardedalloc.a +endif cp -f *.h $(NAN_GUARDEDALLOC)/include/ diff --git a/intern/iksolver/Makefile b/intern/iksolver/Makefile index 8cdb81ca780..512de299fe7 100644 --- a/intern/iksolver/Makefile +++ b/intern/iksolver/Makefile @@ -48,5 +48,9 @@ install: all debug @[ -d $(NAN_IKSOLVER)/lib/debug ] || mkdir $(NAN_IKSOLVER)/lib/debug cp -f $(DIR)/libiksolver.a $(NAN_IKSOLVER)/lib/ cp -f $(DIR)/debug/libiksolver.a $(NAN_IKSOLVER)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_IKSOLVER)/lib/libiksolver.a + ranlib $(NAN_IKSOLVER)/lib/debug/libiksolver.a +endif cp -f extern/*.h $(NAN_IKSOLVER)/include/ diff --git a/intern/keymaker/Makefile b/intern/keymaker/Makefile index 0ed35bc2b44..21ff0c70192 100644 --- a/intern/keymaker/Makefile +++ b/intern/keymaker/Makefile @@ -73,6 +73,9 @@ install: all debug @[ -d $(LCGDIR)/$(LIBNAME)/lib ] || mkdir $(LCGDIR)/$(LIBNAME)/lib cp -f blenkey.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h cp -f $(LIB_a) $(LCGDIR)/$(LIBNAME)/lib/ +ifeq ($(OS),darwin) + ranlib $(LCGDIR)/$(LIBNAME)/lib/lib$(LIBNAME).a +endif $(DIR)/$(DEBUG_DIR)keyloader: $(LOADER_OBJS) $(LIB_a) $(CC) $(LDFLAGS) -o $@ $(LOADER_OBJS) $(LIB_a) $(LIBS) diff --git a/intern/moto/Makefile b/intern/moto/Makefile index 97b4b321d99..927b87bad24 100644 --- a/intern/moto/Makefile +++ b/intern/moto/Makefile @@ -48,5 +48,9 @@ install: all debug @[ -d $(NAN_MOTO)/lib/debug ] || mkdir $(NAN_MOTO)/lib/debug cp -f $(DIR)/libmoto.a $(NAN_MOTO)/lib/ cp -f $(DIR)/debug/libmoto.a $(NAN_MOTO)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_MOTO)/lib/libmoto.a + ranlib $(NAN_MOTO)/lib/debug/libmoto.a +endif cp -f include/*.h $(NAN_MOTO)/include/ diff --git a/intern/string/Makefile b/intern/string/Makefile index b2ae80e2179..1079e3a281a 100644 --- a/intern/string/Makefile +++ b/intern/string/Makefile @@ -48,5 +48,9 @@ install: all debug @[ -d $(NAN_STRING)/lib/debug ] || mkdir $(NAN_STRING)/lib/debug cp -f $(DIR)/libstring.a $(NAN_STRING)/lib/ cp -f $(DIR)/debug/libstring.a $(NAN_STRING)/lib/debug/ +ifeq ($(OS),darwin) + ranlib $(NAN_STRING)/lib/libstring.a + ranlib $(NAN_STRING)/lib/debug/libstring.a +endif cp -f *.h $(NAN_STRING)/include/ -- cgit v1.2.3