diff options
Diffstat (limited to 'tmake')
32 files changed, 36 insertions, 1 deletions
diff --git a/tmake/lib/aix-g++/tmake.conf b/tmake/lib/aix-g++/tmake.conf index b7b0a52..897d509 100755 --- a/tmake/lib/aix-g++/tmake.conf +++ b/tmake/lib/aix-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/aix-xlc/tmake.conf b/tmake/lib/aix-xlc/tmake.conf index e226c14..ef65b37 100755 --- a/tmake/lib/aix-xlc/tmake.conf +++ b/tmake/lib/aix-xlc/tmake.conf @@ -51,6 +51,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/beos-g++/tmake.conf b/tmake/lib/beos-g++/tmake.conf index 14172d6..b6649c9 100755 --- a/tmake/lib/beos-g++/tmake.conf +++ b/tmake/lib/beos-g++/tmake.conf @@ -40,6 +40,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_MOC = moc diff --git a/tmake/lib/bsdi-g++/tmake.conf b/tmake/lib/bsdi-g++/tmake.conf index c3b6de4..65f7316 100755 --- a/tmake/lib/bsdi-g++/tmake.conf +++ b/tmake/lib/bsdi-g++/tmake.conf @@ -48,6 +48,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/dgux-g++/tmake.conf b/tmake/lib/dgux-g++/tmake.conf index f7756e1..f4132d1 100755 --- a/tmake/lib/dgux-g++/tmake.conf +++ b/tmake/lib/dgux-g++/tmake.conf @@ -46,6 +46,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-h, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/freebsd-g++/tmake.conf b/tmake/lib/freebsd-g++/tmake.conf index dd3b3a2..0b3c497 100755 --- a/tmake/lib/freebsd-g++/tmake.conf +++ b/tmake/lib/freebsd-g++/tmake.conf @@ -47,6 +47,7 @@ TMAKE_LFLAGS_SHLIB = -shared TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/gnu-g++/tmake.conf b/tmake/lib/gnu-g++/tmake.conf index ef09a86..635bc5c 100755 --- a/tmake/lib/gnu-g++/tmake.conf +++ b/tmake/lib/gnu-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/hpux-acc/tmake.conf b/tmake/lib/hpux-acc/tmake.conf index a8f539d..dbd0c8e 100755 --- a/tmake/lib/hpux-acc/tmake.conf +++ b/tmake/lib/hpux-acc/tmake.conf @@ -46,6 +46,7 @@ TMAKE_HPUX_SHLIB = 1 TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm -lICE -lSM TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl -lGL TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu TMAKE_LIBS_YACC = -ly diff --git a/tmake/lib/hpux-cc/tmake.conf b/tmake/lib/hpux-cc/tmake.conf index 85b37d0..b5881ec 100755 --- a/tmake/lib/hpux-cc/tmake.conf +++ b/tmake/lib/hpux-cc/tmake.conf @@ -46,6 +46,7 @@ TMAKE_HPUX_SHLIB = 1 TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/hpux-g++/tmake.conf b/tmake/lib/hpux-g++/tmake.conf index cde6172..fb39414 100755 --- a/tmake/lib/hpux-g++/tmake.conf +++ b/tmake/lib/hpux-g++/tmake.conf @@ -46,6 +46,7 @@ TMAKE_HPUX_SHLIB = 1 TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/irix-64/tmake.conf b/tmake/lib/irix-64/tmake.conf index b2027d1..ac0e2fa 100755 --- a/tmake/lib/irix-64/tmake.conf +++ b/tmake/lib/irix-64/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/irix-dcc/tmake.conf b/tmake/lib/irix-dcc/tmake.conf index ae2e504..0fcbaa8 100755 --- a/tmake/lib/irix-dcc/tmake.conf +++ b/tmake/lib/irix-dcc/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/irix-g++/tmake.conf b/tmake/lib/irix-g++/tmake.conf index 4b90f46..2192c71 100755 --- a/tmake/lib/irix-g++/tmake.conf +++ b/tmake/lib/irix-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/irix-n32/tmake.conf b/tmake/lib/irix-n32/tmake.conf index bc05cd2..9d8bcb4 100755 --- a/tmake/lib/irix-n32/tmake.conf +++ b/tmake/lib/irix-n32/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl -lGL TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/irix-o32/tmake.conf b/tmake/lib/irix-o32/tmake.conf index c090518..89b8728 100755 --- a/tmake/lib/irix-o32/tmake.conf +++ b/tmake/lib/irix-o32/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/linux-g++/tmake.conf b/tmake/lib/linux-g++/tmake.conf index c063a01..9f69008 100755 --- a/tmake/lib/linux-g++/tmake.conf +++ b/tmake/lib/linux-g++/tmake.conf @@ -46,6 +46,7 @@ TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_X11SM = -lICE -lSM TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/macosx-c++/tmake.conf b/tmake/lib/macosx-c++/tmake.conf index c876dbd..39f7845 100755 --- a/tmake/lib/macosx-c++/tmake.conf +++ b/tmake/lib/macosx-c++/tmake.conf @@ -47,6 +47,7 @@ TMAKE_LFLAGS_SHLIB = -shared TMAKE_LIBS = TMAKE_LIBS_X11 = TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/netbsd-g++/tmake.conf b/tmake/lib/netbsd-g++/tmake.conf index 5150e64..cad7876 100755 --- a/tmake/lib/netbsd-g++/tmake.conf +++ b/tmake/lib/netbsd-g++/tmake.conf @@ -48,6 +48,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/openbsd-g++/tmake.conf b/tmake/lib/openbsd-g++/tmake.conf index 23e0286..89cdc9b 100755 --- a/tmake/lib/openbsd-g++/tmake.conf +++ b/tmake/lib/openbsd-g++/tmake.conf @@ -48,6 +48,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/osf1-cxx/tmake.conf b/tmake/lib/osf1-cxx/tmake.conf index 44a8493..b3f9a5d 100755 --- a/tmake/lib/osf1-cxx/tmake.conf +++ b/tmake/lib/osf1-cxx/tmake.conf @@ -47,6 +47,7 @@ END TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/osf1-g++/tmake.conf b/tmake/lib/osf1-g++/tmake.conf index 0723af2..e23713e 100755 --- a/tmake/lib/osf1-g++/tmake.conf +++ b/tmake/lib/osf1-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = -Wl,-soname, TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/qnx-g++/tmake.conf b/tmake/lib/qnx-g++/tmake.conf index 441ec50..4846d68 100755 --- a/tmake/lib/qnx-g++/tmake.conf +++ b/tmake/lib/qnx-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = -lunix TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/sco-g++/tmake.conf b/tmake/lib/sco-g++/tmake.conf index e3946e8..c571f98 100755 --- a/tmake/lib/sco-g++/tmake.conf +++ b/tmake/lib/sco-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/solaris-cc-gcc/tmake.conf b/tmake/lib/solaris-cc-gcc/tmake.conf index 5b0e063..de013a0 100755 --- a/tmake/lib/solaris-cc-gcc/tmake.conf +++ b/tmake/lib/solaris-cc-gcc/tmake.conf @@ -47,6 +47,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = -lC TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/solaris-cc/tmake.conf b/tmake/lib/solaris-cc/tmake.conf index a9054d0..3dbe810 100755 --- a/tmake/lib/solaris-cc/tmake.conf +++ b/tmake/lib/solaris-cc/tmake.conf @@ -46,6 +46,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm -lICE -lSM TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl -lGL TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/solaris-g++/tmake.conf b/tmake/lib/solaris-g++/tmake.conf index 5723a91..f4adbcd 100755 --- a/tmake/lib/solaris-g++/tmake.conf +++ b/tmake/lib/solaris-g++/tmake.conf @@ -46,6 +46,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/sunos-g++/tmake.conf b/tmake/lib/sunos-g++/tmake.conf index 322725c..52f9e2d 100755 --- a/tmake/lib/sunos-g++/tmake.conf +++ b/tmake/lib/sunos-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lGL -lGLU -lXmu diff --git a/tmake/lib/ultrix-g++/tmake.conf b/tmake/lib/ultrix-g++/tmake.conf index 8e02cd5..59813eb 100755 --- a/tmake/lib/ultrix-g++/tmake.conf +++ b/tmake/lib/ultrix-g++/tmake.conf @@ -45,6 +45,7 @@ TMAKE_LFLAGS_DEBUG = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu diff --git a/tmake/lib/unix/generic.t b/tmake/lib/unix/generic.t index 53f4e0a..04f7b97 100755 --- a/tmake/lib/unix/generic.t +++ b/tmake/lib/unix/generic.t @@ -47,7 +47,11 @@ if ( !((Project("TARGET") eq "qt") && Project("TMAKE_LIB_FLAG")) ) { Project("TMAKE_LIBDIR_QT") && Project('TMAKE_LIBS *= -L$$TMAKE_LIBDIR_QT'); - Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); + if ( Config("thread") ) { + Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_MT'); + } else { + Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT'); + } } } if ( Config("opengl") ) { diff --git a/tmake/lib/unixware-g++/tmake.conf b/tmake/lib/unixware-g++/tmake.conf index 3ce338a..d4e063f 100755 --- a/tmake/lib/unixware-g++/tmake.conf +++ b/tmake/lib/unixware-g++/tmake.conf @@ -47,6 +47,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = -lc TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lnsl -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXt diff --git a/tmake/lib/unixware7-cc/tmake.conf b/tmake/lib/unixware7-cc/tmake.conf index 71a2fba..6e239dc 100755 --- a/tmake/lib/unixware7-cc/tmake.conf +++ b/tmake/lib/unixware7-cc/tmake.conf @@ -47,6 +47,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lnsl -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXt diff --git a/tmake/lib/unixware7-g++/tmake.conf b/tmake/lib/unixware7-g++/tmake.conf index bb09eec..44f30a5 100755 --- a/tmake/lib/unixware7-g++/tmake.conf +++ b/tmake/lib/unixware7-g++/tmake.conf @@ -47,6 +47,7 @@ TMAKE_LFLAGS_SONAME = TMAKE_LIBS = -lc TMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lnsl -lm TMAKE_LIBS_QT = -lqt +TMAKE_LIBS_QT_MT = -lqt-mt TMAKE_LIBS_QT_OPENGL = -lqgl TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXt |