Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

This commit is contained in:
Alexandre Quessy
2015-10-30 15:22:25 -04:00
4 changed files with 34 additions and 4 deletions

1
.gitignore vendored
View File

@@ -40,3 +40,4 @@ Info.plist
*.xcodeproj/
*.pro.user*
*.app
DMGVERSION.txt

25
INSTALL
View File

@@ -57,15 +57,36 @@ Then, do this::
Build on Mac OS X
-----------------
* Install the Apple Developer Tools. You need to register with a credit card in the Apple Store in order to download it.
* Install Qt5. You can get it from http://qt-project.org/downloads and choose the default location.
* Install liblo
* Install liblo (compile from the tar.gz - it should install it to /usr/local)
* Install the GStreamer framework. You need the runtime and devel packages to be installed:
http://gstreamer.freedesktop.org/data/pkg/osx/1.2.4.1/gstreamer-1.0-devel-1.2.4.1-universal.pkg
http://gstreamer.freedesktop.org/data/pkg/osx/1.2.4.1/gstreamer-1.0-1.2.4.1-universal.pkg
http://gstreamer.freedesktop.org/data/pkg/osx/1.6.0/gstreamer-1.0-1.6.0-x86_64-packages.dmg
http://gstreamer.freedesktop.org/data/pkg/osx/1.6.0/gstreamer-1.0-1.6.0-x86_64.pkg
http://gstreamer.freedesktop.org/data/pkg/osx/1.6.0/gstreamer-1.0-devel-1.6.0-x86_64.pkg
Do this::
./build.sh
It will create a .app and a .dmg.
DMGVERSION.txt should be created automatically with "1" as its contents. Update to "2", and so on, if needed.
Use on OS X
-----------
Users can simply the following two packages:
http://gstreamer.freedesktop.org/data/pkg/osx/1.6.0/gstreamer-1.0-1.6.0-x86_64-packages.dmg
http://gstreamer.freedesktop.org/data/pkg/osx/1.6.0/gstreamer-1.0-1.6.0-x86_64.pkg
MapMap should then work.
If the appearance of the window of the OSC port number in the preferences seem corrupted, you might want to reset MapMap's preferences::
rm -f ~/Library/Preferences/info.mapmap.MapMap.plist

View File

@@ -18,9 +18,9 @@
static void set_env_vars_if_needed()
{
#ifdef __MACOSX_CORE__
std::cout << "OS X detected. Set environment for GStreamer-SDK support." << std::endl;
std::cout << "OS X detected. Set environment for GStreamer support." << std::endl;
if (0 == setenv("GST_PLUGIN_PATH", "/Library/Frameworks/GStreamer.framework/Libraries", 1))
std::cout << " * GST_PLUGIN_PATH=Library/Frameworks/GStreamer.framework/Libraries" << std::endl;
std::cout << " * GST_PLUGIN_PATH=/Library/Frameworks/GStreamer.framework/Libraries" << std::endl;
if (0 == setenv("GST_DEBUG", "2", 1))
std::cout << " * GST_DEBUG=2" << std::endl;
//setenv("LANG", "C", 1);

View File

@@ -122,6 +122,14 @@ mac {
# This tells qmake not to put the executable inside a bundle.
# just for reference. Do not uncomment.
# CONFIG-=app_bundle
# For OSC support: (if pkg-config was installed)
# CONFIG += link_pkgconfig
# PKGCONFIG += lo
LIBS += -L/usr/local/lib -llo
INCLUDEPATH += /usr/local/include
QMAKE_CXXFLAGS += -DHAVE_OSC
}
# Windows-specific: