X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=build%2Ftargets%2Ftarget.pri;h=ff503f02af87a3cda669d611a22107ece8766787;hb=50e2f01c22513696177b2e5ded7e68b8a96564d8;hp=e3b4f6d383730a4543ba07b4dd0f60c1e8cb9b9b;hpb=edc088bb64286c63300a63618509e3604cf845e5;p=quassel.git diff --git a/build/targets/target.pri b/build/targets/target.pri index e3b4f6d3..ff503f02 100644 --- a/build/targets/target.pri +++ b/build/targets/target.pri @@ -10,7 +10,7 @@ SRCPATH = ../../src OBJECTS_DIR = .$$TARGET RCC_DIR = .$$TARGET -linux-g++:static { +linux-g++*:static { # We put libs in contrib/libs that should be linked statically, especially libstdc++.a LIBS *= -L../contrib/libs QMAKE_LFLAGS *= -static-libgcc @@ -19,7 +19,7 @@ linux-g++:static { for(mod, MODULES) { INCLUDEPATH *= $$SRCPATH/$$mod LIBS *= -L../modules/$$dirname(mod) -l$$basename(mod) - #PRE_TARGETDEPS *= ../modules/$$mod + PRE_TARGETDEPS *= ../modules/$$mod } PRE_TARGETDEPS *= ../../version.inc @@ -36,7 +36,7 @@ win32:static { CONFIG += embed_manifest_exe LIBS *= -luser32 -lgdi32 -lkernel32 -lshell32 -lwsock32 -lwinspool -lcomdlg32 -lole32 LIBS *= -ladvapi32 -limm32 -luuid -lwinmm -ldelayimp -lopengl32 -lglu32 -loleaut32 -lws2_32 - LIBS *= -llibeay32MT -lssleay32MT + LIBS *= -llibeay32MD -lssleay32MD QMAKE_LFLAGS_WINDOWS += /nodefaultlib:"libcmt.lib" }