Skip to content

Commit

Permalink
Made build script copy mudlet-lua into the package
Browse files Browse the repository at this point in the history
qmake at this point copies mudlet-lua data into the .app package, and
the mac-deploy.sh script successfully packages a .dmg with mudlet-lua
inside it.

Now all that remains is to adjust Mudlet to look for mudlet-lua when it
loads wherever OS X puts it (that needs finding out).
  • Loading branch information
vadi2 committed Nov 16, 2013
1 parent c9faa9c commit b35528c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,5 @@ src/qrc_mudlet_alpha.cpp

src/mac_src.pro.user*
src/mudlet.app/*

src/mudlet.dmg
3 changes: 2 additions & 1 deletion src/mac-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@

echo Copying Qt and dependent libraries...
export PATH=$PATH:$HOME/Qt/5.1.1/clang_64/bin
echo $PATH
echo Using: $PATH to find macdeployqt
sudo macdeployqt ./mudlet.app -dmg
echo Done!
13 changes: 11 additions & 2 deletions src/mac_src.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ QT += network opengl uitools multimedia

cache()

# use pkg-config whenever possible
# use pkg-config whenever possible for linking on a mac
# the same should be done on the Linux platform as well
macx {
# http://stackoverflow.com/a/16972067
QT_CONFIG -= no-pkg-config
CONFIG += link_pkgconfig
PKGCONFIG += hunspell lua yajl libpcre libzip
}


macx:LIBS += \
# I didn't see an obvious pkg-config option for these two
-lz \
Expand Down Expand Up @@ -254,6 +254,15 @@ unix: {
fonts.files = fonts/ttf-bitstream-vera-1.10/*
target.path = $$BIN_DIR
}

# Copy mudlet-lua into the .app bundle
macx: {
# the location is relative to mac_src.pro, so just use mudlet-lua
APP_MUDLET_LUA_FILES.files = mudlet-lua
APP_MUDLET_LUA_FILES.path = Contents/Resources
QMAKE_BUNDLE_DATA += APP_MUDLET_LUA_FILES
}

INSTALLS += fonts \
luaglobal \
documentation \
Expand Down

0 comments on commit b35528c

Please sign in to comment.