From: vsr <vsr@opencascade.com>
Date: Tue, 8 Feb 2005 13:58:05 +0000 (+0000)
Subject: Modify project file - add 'thread' flag
X-Git-Tag: SALOME_V_2_2_0~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a92d3a36db8d6a1bfb1b3ebb1eff777f36255096;p=tools%2Finstall.git

Modify project file - add 'thread' flag
---

diff --git a/src/Makefile b/src/Makefile
index e490dbd..ac3fa76 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ../bin/SALOME_InstallWizard
-# Generated by qmake (1.03a) on: Fri Feb  4 17:21:43 2005
+# Generated by qmake (1.03a) on: Tue Feb  8 18:14:31 2005
 # Project:  SALOME_INSTALL.pro
 # Template: app
 # Command: $(QMAKE) SALOME_INSTALL.pro
@@ -12,14 +12,14 @@ CC       = gcc
 CXX      = g++
 LEX      = flex
 YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2  -DQT_NO_DEBUG
-CXXFLAGS = -pipe -Wall -W -O2  -DQT_NO_DEBUG
+CFLAGS   = -pipe -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
 LEXFLAGS = 
 YACCFLAGS= -d
 INCPATH  = -I$(QTDIR)/include -I$(QTDIR)/mkspecs/default
 LINK     = g++
 LFLAGS   = 
-LIBS     = $(SUBLIBS)  -Wl,-rpath,$(QTDIR)/lib  -L$(QTDIR)/lib  -L/usr/X11R6/lib -ldl -lSM -lqt-mt -lpthread -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lXext -lX11 -lm
+LIBS     = $(SUBLIBS)  -Wl,-rpath,$(QTDIR)/lib  -L$(QTDIR)/lib  -L/usr/X11R6/lib -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lqt-mt -lpthread -lXext -lX11 -lm
 AR       = ar cqs
 RANLIB   = 
 MOC      = $(QTDIR)/bin/moc
diff --git a/src/README.txt b/src/README.txt
index 77cef65..9329a6b 100644
--- a/src/README.txt
+++ b/src/README.txt
@@ -14,10 +14,6 @@ To build InstalWizard :
 You can rebuild Makefile by using qmake utility when necessary:
 qmake -o Makefile SALOMEPRO_INSTALL.pro
 
-Note: there is one annoying bug of qmake: it addes -lqt flag to Makefile's
-LIBS variable even if there is qt-mt.so (qt-mt.a) library instead of qt.so (qt.a).
-In this case you should edit manually generated Makefile to remove -lqt flag.
-
 ---------------------------------------------------------
 Using Qt files
 ---------------------------------------------------------
diff --git a/src/SALOME_INSTALL.pro b/src/SALOME_INSTALL.pro
index 9083bfa..835beea 100644
--- a/src/SALOME_INSTALL.pro
+++ b/src/SALOME_INSTALL.pro
@@ -6,7 +6,7 @@
 #  Copyright : 2004-2005 CEA
 
 TEMPLATE	=  app
-CONFIG		+= qt warn_on release
+CONFIG		+= qt warn_on release thread
 HEADERS		=  SALOME_InstallWizard.hxx
 HEADERS		+= SALOME_ProductsView.hxx
 HEADERS		+= SALOME_ProgressView.hxx
@@ -23,4 +23,4 @@ SOURCES		+= SALOME_XmlHandler.cxx
 SOURCES		+= SALOME_HelpWindow.cxx
 SOURCES		+= InstallWizard.cpp
 TARGET		= ../bin/SALOME_InstallWizard
-unix:LIBS       += -ldl -lSM -lqt-mt -lpthread -lXrender -lpng -lmng -ljpeg -lGL -lXinerama
+unix:LIBS       += -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama