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

mapmap.pro

@@ -84,11 +84,26 @@ SOURCES  = \
     Util.cpp \
     main.cpp
 
-RESOURCES = mapmap.qrc
-TRANSLATIONS = resources/texts/mapmap_*.ts
+
 include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri)
 include(contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri)
 
+TRANSLATIONS = resources/texts/mapmap_fr.ts
+RESOURCES = mapmap.qrc
+
+# Manage lrelease (for translations)
+isEmpty(QMAKE_LRELEASE) {
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+}
+updateqm.input = TRANSLATIONS
+updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
+updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
+updateqm.CONFIG += no_link
+QMAKE_EXTRA_COMPILERS += updateqm
+PRE_TARGETDEPS += compiler_updateqm_make_all
+system(lrelease mapmap.pro) # Run lrelease
+
 # Add the docs target:
 docs.depends = $(HEADERS) $(SOURCES)
 docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen -
@@ -163,25 +178,23 @@ mac {
 # Windows-specific:
 win32 {
   DEFINES += WIN32
-  INCLUDEPATH += \
-    C:/gstreamer/include \
-    C:/gstreamer/include/libxml2 \
-    C:/gstreamer/include/glib-2.0 \
-    C:/gstreamer/lib/glib-2.0/include \
-    C:/gstreamer/include/gstreamer-0.10
-  LIBS += -L"C:/gstreamer/lib" \
-    -L"C:/gstreamer/bin" \
-    -lgstreamer-0.10 \
-    -lglib-2.0 \
-    -lgmodule-2.0 \
+  INCLUDEPATH += C:/gstreamer/1.0/x86/lib/gstreamer-1.0/include \
+    C:/gstreamer/1.0/x86/include/glib-2.0 \
+    C:/gstreamer/1.0/x86/lib/glib-2.0/include \
+    C:/gstreamer/1.0/x86/include/gstreamer-1.0
+  LIBS += -LC:/gstreamer/1.0/x86/lib \
+    -lgstapp-1.0 \
+    -lgstbase-1.0 \
+    -lgstpbutils-1.0 \
+    -lgstreamer-1.0 \
     -lgobject-2.0 \
-    -lgthread-2.0 \
-    -lgstinterfaces-0.10 \
-    -lopengl32 \
-    -lglu32
+    -lglib-2.0 \
+    -lopengl32
+
   # Add console to the CONFIG to see debug messages printed in 
   # the console on Windows
   CONFIG += console
+  QMAKE_CXXFLAGS += -D_USE_MATH_DEFINES
 }
 
 # Adds the tarball target