Changes: add mAddLibrary function, use it in .pro files

RevBy: Armin, Mirek Details: To simplify addition of a link library to a project for the different platforms, we need this function. Initial patch by Thierry Bastian.
sailfishos · Oct 27, 2010 · cd0fe33 · cd0fe33
1 parent 2250a5c
commit cd0fe33
Show file tree

Hide file tree

Showing 38 changed files with 101 additions and 201 deletions.
diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri
@@ -25,15 +25,7 @@ DEFINES += UNIT_TEST
 target.path = $$[QT_INSTALL_LIBS]/libmeegotouch-benchmarks
 INSTALLS += target
 
-win32|macx {
-    macx {
-        QMAKE_LFLAGS += -F../../lib
-        LIBS += -framework m
-    }
-    win32:LIBS += -lmeegotouchcore0
-} else {
-    LIBS += -lmeegotouchcore
-}
+LIBS += $$mAddLibrary(meegotouchcore)
 
 support_files.files =
 support_files.path = $$[QT_INSTALL_LIBS]/libmeegotouch-benchmarks

diff --git a/benchmarks/mt_mlabel/mt_mlabel.pro b/benchmarks/mt_mlabel/mt_mlabel.pro
@@ -7,4 +7,4 @@ SOURCES += mt_mlabel.cpp
 HEADERS += mt_mlabel.h
 CONFIG += release
 
-LIBS += -lmeegotouchviews
+LIBS += $$mAddLibrary(meegotouchviews)
diff --git a/benchmarks/pt_mlabel/pt_mlabel.pro b/benchmarks/pt_mlabel/pt_mlabel.pro
@@ -6,4 +6,4 @@ TARGET = pt_mlabel
 SOURCES += pt_mlabel.cpp
 HEADERS += pt_mlabel.h
 
-LIBS += -lmeegotouchviews
+LIBS += $$mAddLibrary(meegotouchviews)
diff --git a/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro b/benchmarks/pt_mprogressindicator/pt_mprogressindicator.pro
@@ -6,4 +6,4 @@ TARGET = pt_mprogressindicator
 SOURCES += pt_mprogressindicator.cpp
 HEADERS += pt_mprogressindicator.h
 
-LIBS += -lmeegotouchviews
+LIBS += $$mAddLibrary(meegotouchviews)
diff --git a/demos/animatedlayout/animatedlayout.pro b/demos/animatedlayout/animatedlayout.pro
@@ -13,12 +13,7 @@ INCLUDEPATH += \
 QMAKE_LIBDIR += \
     $$MLIB
 
-macx {
-    QMAKE_LFLAGS += -F../../lib
-    LIBS += -framework meegotouchcore
-} else {
-    LIBS += -lmeegotouchcore
-}
+LIBS += $$mAddLibrary(meegotouchcore)
 
 TEMPLATE = app
 TARGET = animatedlayout

diff --git a/demos/appletinstallationsource/appletinstallationsource.pro b/demos/appletinstallationsource/appletinstallationsource.pro
@@ -19,15 +19,7 @@ INCLUDEPATH += $$MSRCINCLUDE
 HEADERS = fakeinstallationsource.h
 SOURCES = fakeinstallationsource.cpp
 
-win32|macx {
-    macx {
-        QMAKE_LFLAGS += -F../../lib
-        LIBS += -framework \
-            m
-    }
-    win32:LIBS += -lmeegotouchcore0
-}
-else:LIBS += -lmeegotouchcore
+LIBS += $$mAddLibrary(meegotouchcore)
 
 TARGET = $$qtLibraryTarget(appletinventory-fakeinstallationsource)
 DESTDIR = ../../lib

diff --git a/demos/applicationextension/applicationextension.pro b/demos/applicationextension/applicationextension.pro
@@ -9,19 +9,11 @@ INCLUDEPATH += . \
     $$MSRCINCLUDE \
     $$MSRC
 QMAKE_LIBDIR += $$MLIB
-win32|macx {
-    macx {
-        QMAKE_LFLAGS += -F../../lib
-        LIBS += -framework \
-            m
-    }
-    win32:LIBS += -lmeegotouchcore0
-}
-else:LIBS += \
-    -lmeegotouchcore \
-    -lmeegotouchviews \
-    -lmeegotouchsettings \
-    -lmeegotouchextensions \
+
+LIBS += $$mAddLibrary(meegotouchcore) \
+        $$mAddLibrary(meegotouchviews) \
+        $$mAddLibrary(meegotouchsettings) \
+        $$mAddLibrary(meegotouchextensions)
 
 TEMPLATE = app
 TARGET = applicationextensiondemo

diff --git a/demos/applicationextension/demoextension/demoextension.pro b/demos/applicationextension/demoextension/demoextension.pro
@@ -18,15 +18,7 @@ INCLUDEPATH += $$MSRCINCLUDE ../
 HEADERS = demoextension.h
 SOURCES = demoextension.cpp
 
-win32|macx {
-    macx {
-        QMAKE_LFLAGS += -F../../../lib
-        LIBS += -framework \
-            m
-    }
-    win32:LIBS += -lmeegotouchcore0
-}
-else:LIBS += -lmeegotouchcore
+LIBS += $$mAddLibrary(meegotouchcore)
 
 TARGET = $$qtLibraryTarget(applicationextensiondemo-demoextension)
 DESTDIR = ../../../lib

diff --git a/demos/applicationextension/demoextension2/demoextension2.pro b/demos/applicationextension/demoextension2/demoextension2.pro
@@ -18,15 +18,7 @@ INCLUDEPATH += $$MSRCINCLUDE ../
 HEADERS = demoextension.h
 SOURCES = demoextension.cpp
 
-win32|macx {
-    macx {
-        QMAKE_LFLAGS += -F../../../lib
-        LIBS += -framework \
-            m
-    }
-    win32:LIBS += -lmeegotouchcore0
-}
-else:LIBS += -lmeegotouchcore
+LIBS += $$mAddLibrary(meegotouchcore)
 
 TARGET = $$qtLibraryTarget(applicationextensiondemo-demoextension2)
 DESTDIR = ../../../lib

diff --git a/demos/widgetsgallery/applets/galleryapplet/galleryapplet.pro b/demos/widgetsgallery/applets/galleryapplet/galleryapplet.pro
@@ -13,18 +13,9 @@ INCLUDEPATH += . \
     $$MSRC/mashup/appletinterface
 
 QMAKE_LIBDIR += \
-    $$MLIB \
-
-win32|macx {
-	macx {
-	        QMAKE_LFLAGS += -F$$MLIB
-	        LIBS += -framework m
-	     }
-        win32:LIBS += -lmeegotouchcore0
-} else {
-    LIBS += -lmeegotouchcore
-}
-
+    $$MLIB
+
+LIBS += $$mAddLibrary(meegotouchcore)
 
 HEADERS       = galleryapplet.h \
                 gallery.h \

diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro
@@ -9,20 +9,11 @@ INCLUDEPATH += . \
     $$MSRC/corelib
 
 QMAKE_LIBDIR += $$MLIB
-win32|macx {
-    macx {
-        QMAKE_LFLAGS += -F../../lib
-        LIBS += -framework meegotouchcore \
-                -framework meegotouchviews
-    }
-    win32:LIBS += -lmeegotouchcore0 \
-                  -lmeegotouchviews0
-}
-else:LIBS += \
-    -lmeegotouchcore \
-    -lmeegotouchviews \
-    -lmeegotouchsettings \
-    -lmeegotouchextensions \
+
+LIBS += $$mAddLibrary(meegotouchcore) \
+        $$mAddLibrary(meegotouchviews) \
+        $$mAddLibrary(meegotouchsettings) \
+        $$mAddLibrary(meegotouchextensions)
 
 TEMPLATE = app
 TARGET = widgetsgallery

diff --git a/examples/chaining/common.pri b/examples/chaining/common.pri
@@ -1,6 +1,8 @@
+include( ../common.pri )
+
 INCLUDEPATH += ../../../src/include
 QMAKE_LIBDIR += ../../../lib/
-LIBS += -lmeegotouchcore
+LIBS += $$mAddLibrary(meegotouchcore)
 
 DEPENDPATH += .
 INCLUDEPATH += .
diff --git a/examples/common.pri b/examples/common.pri
@@ -1,6 +1,8 @@
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-LIBS += -lmeegotouchcore
+include( ../mkspecs/common.pri )
+
+INCLUDEPATH += $$M_SOURCE_TREE/src/include
+
+LIBS += $$mAddLibrary(meegotouchcore)
 
 DEPENDPATH += .
 INCLUDEPATH += .
diff --git a/examples/helloworld/helloworld.pro b/examples/helloworld/helloworld.pro
@@ -1,4 +1,8 @@
-include( ../common.pri )
+include(../common.pri)
+
+
+LIBS += $$mAddLibrary(meegotouchcore)
+
 
 TEMPLATE = app
 TARGET = helloworld

diff --git a/examples/layout/common.pri b/examples/layout/common.pri
@@ -1,6 +1 @@
-INCLUDEPATH += ../../../src/include
-QMAKE_LIBDIR += ../../../lib/
-LIBS += -lmeegotouchcore
-
-DEPENDPATH += .
-INCLUDEPATH += .
+include (../common.pri)
diff --git a/examples/lifecycle/lifecycle.pro b/examples/lifecycle/lifecycle.pro
@@ -1,8 +1,8 @@
 include( ../common.pri )
 
-LIBS += -lmeegotouchsettings
-LIBS += -lmeegotouchviews
-LIBS += -lmeegotouchextensions
+LIBS += $$mAddLibrary(meegotouchsettings) \
+        $$mAddLibrary(meegotouchviews) \
+        $$mAddLibrary(meegotouchextensions)
 
 TEMPLATE = app
 TARGET   = lifecycle

diff --git a/examples/servicefw/user/user.pro b/examples/servicefw/user/user.pro
@@ -30,9 +30,9 @@ SOURCES    = \
     echowindow.cpp \
     main.cpp \
 
+LIBS += $$mAddLibrary(meegotouchcore)
 LIBS += \
-    -lmeegotouchcore \
-    -ltextprocessor \
+    -ltextprocessor
 
 target.path = $$M_INSTALL_BIN
 

diff --git a/examples/testwidget/testwidget.pro b/examples/testwidget/testwidget.pro
@@ -14,9 +14,9 @@ win32 {
 
 include( ../../mkspecs/features/meegotouch_mgen.prf )
 
-LIBS += -lmeegotouchsettings
-LIBS += -lmeegotouchviews
-LIBS += -lmeegotouchextensions
+LIBS += $$mAddLibrary(meegotouchsettings) \
+        $$mAddLibrary(meegotouchviews) \
+        $$mAddLibrary(meegotouchextensions)
 
 TEMPLATE = app
 TARGET = testwidget

diff --git a/mappletrunner/mappletrunner.pro b/mappletrunner/mappletrunner.pro
@@ -12,11 +12,10 @@ TEMPLATE = app
 TARGET =
 DEPENDPATH += .
 
-LIBS += \
-    -lmeegotouchcore \
-    -lmeegotouchviews \
-    -lmeegotouchsettings \
-    -lmeegotouchextensions \
+LIBS += $$mAddLibrary(meegotouchcore) \
+        $$mAddLibrary(meegotouchviews) \
+        $$mAddLibrary(meegotouchsettings) \
+        $$mAddLibrary(meegotouchextensions)
 
 QT += core \
     network \

diff --git a/mapplicationextensionrunner/mapplicationextensionrunner.pro b/mapplicationextensionrunner/mapplicationextensionrunner.pro
@@ -13,11 +13,10 @@ TEMPLATE = app
 TARGET =
 DEPENDPATH += .
 
-LIBS += \
-    -lmeegotouchcore \
-    -lmeegotouchviews \
-    -lmeegotouchsettings \
-    -lmeegotouchextensions \
+LIBS += $$mAddLibrary(meegotouchcore) \
+        $$mAddLibrary(meegotouchviews) \
+        $$mAddLibrary(meegotouchsettings) \
+        $$mAddLibrary(meegotouchextensions)
 
 QT += core \
     network \

diff --git a/mkspecs/features/meegotouch.prf b/mkspecs/features/meegotouch.prf
@@ -1,13 +1,10 @@
 include(meegotouch_common.prf)
 
-macx {
-    LIBS += \
-        -framework meegotouchcore
-} else {
+LIBS += $$mAddLibrary(meegotouchcore)
+!macx {
     !contains(DEFINES, BUILD_M) {
         LIBS += \
-	    -lmeegotouchcore \
-	    -lmeegotouchsettings \
-	    -lmeegotouchextensions
+	    $$mAddLibrary(meegotouchsettings) \
+	    $$mAddLibrary(meegotouchextensions)
     }
 }
diff --git a/mkspecs/features/meegotouch_defines.prf.in b/mkspecs/features/meegotouch_defines.prf.in
@@ -108,3 +108,20 @@ win32 {
     M_DBUS_INTERFACES_DIR = /usr/share/dbus-1/interfaces
     M_DBUS_SERVICES_DIR = $$M_INSTALL_DATA/dbus-1/services
 }
+
+defineReplace(mAddLibrary) {
+    LIBRARY_NAME = $$1
+    macx {
+        QMAKE_LFLAGS *= -F $$M_BUILD_TREE/lib
+        return (-framework $$LIBRARY_NAME)
+    } else {
+        win32 {
+            CONFIG(debug, debug|release) {
+                return ("-l"$${LIBRARY_NAME}d$${M_MAJOR_VERSION})
+            } else {
+                return ("-l"$${LIBRARY_NAME}$${M_MAJOR_VERSION})
+            }
+        }
+        return (-l$$LIBRARY_NAME)
+    }
+}
diff --git a/mkspecs/features/meegotouchcore.prf b/mkspecs/features/meegotouchcore.prf
@@ -1,9 +1,3 @@
 include(meegotouch_common.prf)
 
-macx {
-    LIBS += -framework meegotouchcore
-} else {
-    !contains(DEFINES, BUILD_M) {
-        LIBS += -lmeegotouchcore
-    }
-}
+LIBS += $$mAddLibrary(meegotouchcore)
diff --git a/mkspecs/features/meegotouchsettings.prf b/mkspecs/features/meegotouchsettings.prf
@@ -1,13 +1,4 @@
 include(meegotouch_common.prf)
 
-macx {
-    LIBS += \
-        -framework meegotouchcore \
-        -framework meegotouchsettings \
-} else {
-    !contains(DEFINES, BUILD_M) {
-        LIBS += \
-	    -lmeegotouchcore \
-	    -lmeegotouchsettings \
-    }
-}
+LIBS += $$mAddLibrary(meegotouchcore) \
+        $$mAddLibrary(meegotouchsettings)
diff --git a/src/extensions/extensions.pro b/src/extensions/extensions.pro
@@ -21,7 +21,8 @@ contains(DEFINES, HAVE_DBUS) {
     include(style/style.pri)
 }
 
-LIBS += -lmeegotouchviews -lmeegotouchsettings -lmeegotouchcore
+
+LIBS += $$mAddLibrary(meegotouchcore) $$mAddLibrary(meegotouchsettings) $$mAddLibrary(meegotouchviews)
 
 SOURCES += mextensionwatcher.cpp \
            mextensionslibrary.cpp

diff --git a/src/settings/settings.pro b/src/settings/settings.pro
@@ -13,6 +13,6 @@ include(settingslanguage/settingslanguage.pri)
 
 SOURCES += msettingslibrary.cpp
 
-LIBS += -lmeegotouchcore
+LIBS += $$mAddLibrary(meegotouchcore)
 
 include(../common_bot.pri)
diff --git a/src/views/views.pro b/src/views/views.pro
@@ -21,14 +21,7 @@ include(animations/animations.pri)
 include(style/style.pri)
 include(video/video.pri)
 
-win32|macx {
-    macx {
-        QMAKE_LFLAGS += -F../../lib
-        LIBS += -framework meegotouchcore
-    }
-    win32:LIBS += -lmeegotouchcore0
-}
-else:LIBS += -lmeegotouchcore
+LIBS += $$mAddLibrary(meegotouchcore)
 
 SOURCES += mviewslibrary.cpp
 

diff --git a/tests/common_mextensions.pri b/tests/common_mextensions.pri
@@ -8,4 +8,4 @@ INCLUDEPATH += \
     $$MSRCDIR/extensions/mashup/mashup \
     $$MSRCDIR/extensions/style \
 
-LIBS += -lmeegotouchextensions
+LIBS += $$mAddLibrary(meegotouchextensions)
diff --git a/tests/common_msettings.pri b/tests/common_msettings.pri
@@ -1,5 +1,5 @@
 INCLUDEPATH += \
     $$MSRCDIR/settings/settingslanguage \
 
-LIBS += -lmeegotouchsettings
+LIBS += $$mAddLibrary(meegotouchsettings)