From 15695197b42ea0463ec9aa6fecfad51f789775da Mon Sep 17 00:00:00 2001 From: Patrick Luby Date: Fri, 2 Mar 2001 04:02:52 +0000 Subject: [PATCH] Added support for unique, non-colliding lib*static*.dylib files for each project for Mac OS X --- sc/prj/d.lst | 3 ++- scaddins/prj/d.lst | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sc/prj/d.lst b/sc/prj/d.lst index 28e456a12356..3dd812e19d6f 100644 --- a/sc/prj/d.lst +++ b/sc/prj/d.lst @@ -32,8 +32,9 @@ mkdir: %_DEST%\ucr%_EXT%\sc ..\xml\*.xml %_DEST%\xml\*.xml -..\%__SRC%\lib\libstatic*.dylib %_DEST%\lib%_EXT%\libstatic*.dylib +..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib ..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx ..\%__SRC%\misc\*staticdatamembers.hxx %_DEST%\inc%_EXT%\*staticdatamembers.hxx dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" +dos: sh -c "if test dos: sh -c "if test %OS% = MACOSX; then create-libstatic-link %_DEST%\lib%_EXT%; fi" diff --git a/scaddins/prj/d.lst b/scaddins/prj/d.lst index b04c65521cb2..bbc1b352e643 100644 --- a/scaddins/prj/d.lst +++ b/scaddins/prj/d.lst @@ -6,8 +6,9 @@ ..\%__SRC%\misc\*.hid %_DEST%\bin%_EXT%\*.hid ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res -..\%__SRC%\lib\libstatic*.dylib %_DEST%\lib%_EXT%\libstatic*.dylib +..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib ..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx ..\%__SRC%\misc\*staticdatamembers.hxx %_DEST%\inc%_EXT%\*staticdatamembers.hxx dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" +dos: sh -c "if test dos: sh -c "if test %OS% = MACOSX; then create-libstatic-link %_DEST%\lib%_EXT%; fi"