diff options
author | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-04-21 09:11:55 -0400 |
---|---|---|
committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-04-21 09:11:55 -0400 |
commit | e603021ed60b4de1ad02f543eb87b3e79faea3e6 (patch) | |
tree | e3a7fd1f57a9d2ded46d437259e9fa9201092d58 | |
parent | addf575a91f39d8485f7d9006ea8a9eb081d4da1 (diff) |
Attempt to fix experimental 64-bit Mac build issues.
-rwxr-xr-x | scripts/osx/textadept_osx | 2 | ||||
-rw-r--r-- | src/Makefile | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/osx/textadept_osx b/scripts/osx/textadept_osx index 13b4b7c9..5575c9a0 100755 --- a/scripts/osx/textadept_osx +++ b/scripts/osx/textadept_osx @@ -4,7 +4,7 @@ # Set the GTK environment variables of resources within Textadept.app. bundle=$(cd "$(dirname "$0")/../../" && pwd) bundle_res="$bundle/Contents/Resources" -export DYLD_LIBRARY_PATH="$bundle_res/lib:$DYLD_LIBRARY_PATH" +export DYLD_LIBRARY_PATH="$bundle_res/lib" export GTK_DATA_PREFIX="$bundle_res" export GTK_EXE_PREFIX="$bundle_res" export GTK_PATH="$bundle_res" diff --git a/src/Makefile b/src/Makefile index 73b1b13e..4941a1b0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -319,9 +319,10 @@ osxapp_libs = libatk-1.0.0.dylib libcairo.2.dylib libexpat.1.dylib \ libgio-2.0.0.dylib libglib-2.0.0.dylib libgmodule-2.0.0.dylib \ libgobject-2.0.0.dylib libgthread-2.0.0.dylib \ libgtkmacintegration.2.dylib libgtk-quartz-2.0.0.dylib \ - libintl.8.dylib libpango-1.0.0.dylib libpangocairo-1.0.0.dylib \ - libpangoft2-1.0.0.dylib libpixman-1.0.dylib libpng16.16.dylib \ - charset.alias gdk-pixbuf-2.0 gtk-2.0 + libharfbuzz.0.dylib libintl.8.dylib libpango-1.0.0.dylib \ + libpangocairo-1.0.0.dylib libpangoft2-1.0.0.dylib \ + libpixman-1.0.dylib libpng16.16.dylib charset.alias \ + gdk-pixbuf-2.0 gtk-2.0 release-all: release release64 win32-release osx-release modules-release |