]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Modify project file to force Qt library to be at the first place before other librari...
authorvsr <vsr@opencascade.com>
Tue, 15 Feb 2005 11:19:46 +0000 (11:19 +0000)
committervsr <vsr@opencascade.com>
Tue, 15 Feb 2005 11:19:46 +0000 (11:19 +0000)
src/Makefile
src/SALOME_INSTALL.pro

index ac3fa765a1e0bbf1f36b3169aae530ab1f38c6bd..ecfd30663ba4467d7f526a187cee5c84185d5234 100644 (file)
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ../bin/SALOME_InstallWizard
-# Generated by qmake (1.03a) on: Tue Feb  8 18:14:31 2005
+# Generated by qmake (1.03a) on: Wed Feb  9 18:40:38 2005
 # Project:  SALOME_INSTALL.pro
 # Template: app
 # Command: $(QMAKE) SALOME_INSTALL.pro
@@ -19,7 +19,7 @@ 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 -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lqt-mt -lpthread -lXext -lX11 -lm
+LIBS     = $(SUBLIBS)  -Wl,-rpath,$(QTDIR)/lib  -L$(QTDIR)/lib  -L/usr/X11R6/lib -lqt-mt -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lqt-mt -lpthread -lXext -lX11 -lm
 AR       = ar cqs
 RANLIB   = 
 MOC      = $(QTDIR)/bin/moc
index 835beea029a97eec37e67a817f363f588e2aed28..38126b7503bf603c96605dd29e4183dcd2834e4a 100644 (file)
@@ -23,4 +23,4 @@ SOURCES               += SALOME_XmlHandler.cxx
 SOURCES                += SALOME_HelpWindow.cxx
 SOURCES                += InstallWizard.cpp
 TARGET         = ../bin/SALOME_InstallWizard
-unix:LIBS       += -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama
+unix:LIBS       += -lqt-mt -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama