diff options
| author | bjarni <bjarni@openttd.org> | 2005-11-23 12:21:54 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-11-23 12:21:54 +0000 |
| commit | 08b990886d490279d4849a7694376cdec76cc228 (patch) | |
| tree | f10e560b550d7fcbc2bc8532dc25e33cfce6532c /makefiledir | |
| parent | 492723691260bd2a79c7aa28d8c487198236333b (diff) | |
| download | openttd-08b990886d490279d4849a7694376cdec76cc228.tar.xz | |
(svn r3230) -Feature: [OSX] OSX builds can now change where it searches for dynamic libs and can move libs into the bundle
This is not a fix for the issues with static linking, more like a workaround. Static linking still got issues
Apple recommends to use dynamic linking anyway, so I guess this doesn't matter much
Diffstat (limited to 'makefiledir')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 6 | ||||
| -rw-r--r-- | makefiledir/Makefile.libdetection | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index f74197edd..982a91fe5 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -74,6 +74,12 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH)) $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# Lib paths for OSX. If you do not know what they do, do not touch them) + $(call CONFIG_LINE,OSX_LIB_PATH:=$(OSX_LIB_PATH)) + $(call CONFIG_LINE,OSX_LOCAL_LIB_PATH:=$(OSX_LOCAL_LIB_PATH)) + $(call CONFIG_LINE,OSX_CHANGE_LIB_PATH:=$(OSX_CHANGE_LIB_PATH)) + $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# OS flags) $(call CONFIG_LINE,WIN32:=$(WIN32)) $(call CONFIG_LINE,UNIX:=$(UNIX)) diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index ff9e68a3a..9177061ee 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -23,8 +23,6 @@ ifeq ($(shell uname), Darwin) OSX:=1 # OSX uses the unix setup too UNIX:=1 -# OSX generally uses static since so few computers actually have all the libs installed in unix style -STATIC:=1 endif # Automatically recognize if building on MorphOS |