Salome HOME
projects
/
tools
/
install.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8dd6a1
)
Move Install Wizard to 64bits platform
author
rnv
<rnv@opencascade.com>
Thu, 28 Nov 2013 13:59:34 +0000
(13:59 +0000)
committer
rnv
<rnv@opencascade.com>
Thu, 28 Nov 2013 13:59:34 +0000
(13:59 +0000)
bin/SALOME_InstallWizard
patch
|
blob
|
history
src/Makefile
patch
|
blob
|
history
diff --git
a/bin/SALOME_InstallWizard
b/bin/SALOME_InstallWizard
index ba676f37df05377c9bd6ef3193e47e94445062f7..083c0a3bad56f099e1fe16c18af5d0d8c67aae4a 100755
(executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ
diff --git
a/src/Makefile
b/src/Makefile
index 82a200cbca470c07da4d07a170d9957f55f862c5..da5eb0dcf7c4dc368d1070fc89834e8dfeed63ae 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,6
+1,6
@@
#############################################################################
# Makefile for building: ../bin/SALOME_InstallWizard
#############################################################################
# Makefile for building: ../bin/SALOME_InstallWizard
-# Generated by qmake (1.07a) (Qt 3.3.8) on:
Fri May 28 14:01:16 2010
+# Generated by qmake (1.07a) (Qt 3.3.8) on:
Thu Nov 28 16:34:34 2013
# Project: SALOME_INSTALL.pro
# Template: app
# Command: $(QMAKE) -o Makefile SALOME_INSTALL.pro
# Project: SALOME_INSTALL.pro
# Template: app
# Command: $(QMAKE) -o Makefile SALOME_INSTALL.pro
@@
-16,10
+16,10
@@
CFLAGS = -pipe -Wno-deprecated -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_T
CXXFLAGS = -pipe -Wno-deprecated -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
LEXFLAGS =
YACCFLAGS= -d
CXXFLAGS = -pipe -Wno-deprecated -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
LEXFLAGS =
YACCFLAGS= -d
-INCPATH = -I/dn
06/salome/vsr/static/qt-3.3.3
/mkspecs/default -I. -I$(QTDIR)/include
+INCPATH = -I/dn
20/salome/rnv/static/qt-x11-free-3.3.8
/mkspecs/default -I. -I$(QTDIR)/include
LINK = g++
LFLAGS = -Wl,-rpath,$(QTDIR)/lib
LINK = g++
LFLAGS = -Wl,-rpath,$(QTDIR)/lib
-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -L/usr/X11R6/lib -lXrender -lX
inerama
-lSM -lICE -ldl -lXext -lX11 -lm -lpthread
+LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -L/usr/X11R6/lib -lXrender -lX
randr -lXcursor -lXinerama -lXft -lfreetype -lfontconfig
-lSM -lICE -ldl -lXext -lX11 -lm -lpthread
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
@@
-119,7
+119,7
@@
uicables: $(UICDECLS) $(UICIMPLS)
$(MOC):
( cd $(QTDIR)/src/moc && $(MAKE) )
$(MOC):
( cd $(QTDIR)/src/moc && $(MAKE) )
-Makefile: SALOME_INSTALL.pro /dn
06/salome/vsr/static/qt-3.3.3/mkspecs/default/qmake.conf /dn06/salome/vsr/static/qt-3.3.3
/lib/libqt-mt.prl
+Makefile: SALOME_INSTALL.pro /dn
20/salome/rnv/static/qt-x11-free-3.3.8/mkspecs/default/qmake.conf /dn20/salome/rnv/static/qt-x11-free-3.3.8
/lib/libqt-mt.prl
$(QMAKE) -o Makefile SALOME_INSTALL.pro
qmake:
@$(QMAKE) -o Makefile SALOME_INSTALL.pro
$(QMAKE) -o Makefile SALOME_INSTALL.pro
qmake:
@$(QMAKE) -o Makefile SALOME_INSTALL.pro