aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authornexus89 <nexus89@b956fd51-792f-4845-bead-9b4dfca2ff2c>2011-01-02 20:51:54 +0000
committernexus89 <nexus89@b956fd51-792f-4845-bead-9b4dfca2ff2c>2011-01-02 20:51:54 +0000
commit29fc8d5cbd01cfc2f019e1c2c1855c9e7f6c8971 (patch)
tree6d5841caa7cdcdb646634929bb62216577c06724 /Makefile.in
parentb0f04cb5d1165dad8295f502977cfd7357212a25 (diff)
downloadusdx-29fc8d5cbd01cfc2f019e1c2c1855c9e7f6c8971.tar.gz
usdx-29fc8d5cbd01cfc2f019e1c2c1855c9e7f6c8971.tar.xz
usdx-29fc8d5cbd01cfc2f019e1c2c1855c9e7f6c8971.zip
Move OSX libs related functions in Makefile to make it working again in Linux
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2787 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in29
1 files changed, 16 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in
index 7e9450a6..8816a9c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,6 +86,22 @@ DEPS += $(PROJECTM_CWRAPPER_DIR)
endif
#################################################
+# Mac OS X library functions
+#################################################
+# copy the dylib and change its install names
+
+define install_osx_libraries
+ $(shell $(INSTALL) -m 755 $(dylib) $(macosx_bundle_path)/MacOS)
+ $(shell $(INSTALL_NAME_TOOL) -change $(dylib) @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/ultrastardx)
+ $(shell $(INSTALL_NAME_TOOL) -id @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+ $(foreach linked_dylibs_2,$(shell $(OTOOL) -L $(dylib) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \usr\/lib | grep -v executable_path),$(rename_secondary_osx_libraries))
+endef
+
+define rename_secondary_osx_libraries
+ $(shell $(INSTALL_NAME_TOOL) -change $(linked_dylibs_2) @executable_path/$(notdir $(linked_dylibs_2)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+endef
+
+#################################################
# general targets
#################################################
@@ -409,19 +425,6 @@ macosx-standalone-app: macosx-app
@echo "Creating the standalone Mac OS X application"
@echo ""
-# copy the dylib and change its install names
-
-define install_osx_libraries
- $(shell $(INSTALL) -m 755 $(dylib) $(macosx_bundle_path)/MacOS)
- $(shell $(INSTALL_NAME_TOOL) -change $(dylib) @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/ultrastardx)
- $(shell $(INSTALL_NAME_TOOL) -id @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
- $(foreach linked_dylibs_2,$(shell $(OTOOL) -L $(dylib) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \usr\/lib | grep -v executable_path),$(rename_secondary_osx_libraries))
-endef
-
-define rename_secondary_osx_libraries
- $(shell $(INSTALL_NAME_TOOL) -change $(linked_dylibs_2) @executable_path/$(notdir $(linked_dylibs_2)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
-endef
-
# work on the dylibs in $(macosx_bundle_path)/MacOS/ultrastardx
$(foreach dylib,$(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/ultrastardx | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))