Merge branch 'bugfix-port-windows' into develop

INSTALL

@@ -104,3 +104,33 @@ 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
+
+Build for release on Windows
+----------------------------
+- Download gstreamer-x86 runtime& devel 
+https://gstreamer.freedesktop.org/data/pkg/windows/1.7.91/gstreamer-1.0-x86-1.7.91.msi https://gstreamer.freedesktop.org/data/pkg/windows/1.7.91/gstreamer-1.0-devel-x86-1.7.91.msi
+
+
+- Choose complete option during installation process wizard
+- Build Mapmap with Qt Creator (qmake, build release)
+- Add the bin directory of your Qt installation (e.g. e.g. C:\Qt\Qt5.6.0\5.6\mingw49_32\bin) to the PATH variable
+- Open Windows console then run the following command:
+	windeployqt --release --no-translations --no-system-d3d-compiler <path-to-app-binary>
+
+- Copy the followings DLL into the target folder together with Mapmap.exe
+	libffi-6.dll libgobject-2.0-0.dll libgstbase-1.0-0.dll libgsttag-1.0-0.dll liborc-0.4-0.dll 
+	libglib-2.0-0.dll libgstapp-1.0-0.dll 	libgstpbutils-1.0-0.dll libgstvideo-1.0-0.dll libz.dll 
+	libgmodule-2.0-0.dll libgstaudio-1.0-0.dll libgstreamer-1.0-0.dll libintl-8.dll
+- Copy all DLL files of the Gstreamer's bin folder (e.g. C:) into a new folder named 'lib' in the target folder together with mapmap.exe
+
+- Copy all DLL files of the Gstreamer's plugin folder into a new folder named 'plugins' in parallel of lib folder
+
+
+- Remove lib\libopenh264.dll, lib\libSoundTouch-0.dll, lib\libtag.dll
+
+- Run Mapamp.exe
+
+
+
+
+

MainApplication.cpp

@@ -25,6 +25,15 @@ MM_BEGIN_NAMESPACE
 MainApplication::MainApplication(int &argc, char *argv[])
   : QApplication(argc, argv)
 {
+#ifdef Q_OS_WIN
+  // Set GStreamer plugins path on Windows
+  QString pluginPath = QCoreApplication::applicationDirPath() + "/plugins";
+  QString libPath = QCoreApplication::applicationDirPath() + "/lib";
+
+  _putenv_s("GST_PLUGIN_PATH", pluginPath.toLocal8Bit());
+  _putenv_s("PATH", libPath.toLocal8Bit());
+#endif
+
   // Initialize GStreamer.
   gst_init (NULL, NULL);
 

mapmap.pro

@@ -189,10 +189,14 @@ mac {
 win32 {
   DEFINES += WIN32
   TARGET = Mapmap
-  GST_HOME = $$quote(C:\gstreamer\1.0\x86)
+  GST_HOME = $$quote($$(GSTREAMER_1_0_ROOT_X86))
   isEmpty(GST_HOME) {
-    message(\"C:\gstreamer\1.0\x86\" not detected ...)
+    message(\"GSTREAMER_1_0_ROOT_X86\" not detected ...)
   }
+  else {
+    message(\"GSTREAMER_1_0_ROOT_X86\" detected in \"$${GST_HOME}\")
+  }
+#  DESTDIR = ../../Mapmap # Just for packaging
 
   INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \
     $${GST_HOME}/include/glib-2.0 \
@@ -207,8 +211,9 @@ win32 {
     $${GST_HOME}/lib/glib-2.0.lib \
     -lopengl32
 
-  RC_FILE = mapmap_resource.rc
+  CONFIG += release
 
+  RC_FILE = mapmap_resource.rc
   QMAKE_CXXFLAGS += -D_USE_MATH_DEFINES
 }
 

mapmap_resource.rc

@@ -21,12 +21,12 @@ VS_VERSION_INFO VERSIONINFO
 		BEGIN
 			BLOCK "040904b0"
 			BEGIN
-				VALUE "CompanyName", "\0"
-				VALUE "FileDescription", "\0"
+                                VALUE "CompanyName", "Mapmap Team\0"
+                                VALUE "FileDescription", "MapMap\0"
 				VALUE "FileVersion", "0.4.0.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "Mapmap.exe\0"
-				VALUE "ProductName", "Mapmap\0"
+                                VALUE "ProductName", "MapMap\0"
 				VALUE "ProductVersion", "0.4.0.0\0"
 			END
 		END
@@ -37,3 +37,5 @@ VS_VERSION_INFO VERSIONINFO
 	END
 /* End of Version info */
 
+IDI_ICON1               ICON    DISCARDABLE     "resources/images/logo/mapmap.ico"
+