nearly finished GroupBlock VHDL gen

[blast.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e18672ce4e592db36c9bd8f0b1e32507b7c7c6dc..ab2cc125b82429e806342458a89f34ca6d52c8f5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ CXXFLAGS     = $(CXXFLAGS-$(OS)$(ARCH))
 
 INCPATH-lin64-qt4       = -I/usr/share/qt4/mkspecs/linux-g++ -I$(QTPATH)/QtCore -I$(QTPATH)/QtGui -I$(QTPATH)/QtNetwork -I$(QTPATH)/QtXml -I$(QTPATH)/QtXmlPatterns -I$(QTPATH)
 INCPATH-lin64-qt5       = -I$(QTPATH)/mkspecs/linux-g++-64 -I$(QTPATH) -I$(QTPATH)/QtWidgets -I$(QTPATH)/QtCore -I$(QTPATH)/QtGui -I$(QTPATH)/QtPrintSupport -I$(QTPATH)/QtNetwork -I$(QTPATH)/QtXml -I$(QTPATH)/QtXmlPatterns 
 
 INCPATH-lin64-qt4       = -I/usr/share/qt4/mkspecs/linux-g++ -I$(QTPATH)/QtCore -I$(QTPATH)/QtGui -I$(QTPATH)/QtNetwork -I$(QTPATH)/QtXml -I$(QTPATH)/QtXmlPatterns -I$(QTPATH)
 INCPATH-lin64-qt5       = -I$(QTPATH)/mkspecs/linux-g++-64 -I$(QTPATH) -I$(QTPATH)/QtWidgets -I$(QTPATH)/QtCore -I$(QTPATH)/QtGui -I$(QTPATH)/QtPrintSupport -I$(QTPATH)/QtNetwork -I$(QTPATH)/QtXml -I$(QTPATH)/QtXmlPatterns 

-INCPATH-win32-qt5       = -I$(QTPATH)/mkspecs/win32-g++ -I$(QTPATH)/include -I$(QTPATH)/include/ActiveQt -I$(QTPATH)/include/QtWidgets -I$(QTPATH)/include/QtGui -I$(QTPATH)/include/QtCore -I$(QTPATH)/include/QtXml -I$(QTPATH)/include/QtXmlPatterns -I$(QTPATH)/include/QtPrintSupport
+INCPATH-win32-qt5       = -I$(QTPATH)/mkspecs/win32-g++ -I$(QTPATH)/include -I$(QTPATH)/include/ActiveQt -I$(QTPATH)/include/QtWidgets -I$(QTPATH)/include/QtGui -I$(QTPATH)/include/QtCore -I$(QTPATH)/inlucde/QtNetwork -I$(QTPATH)/include/QtXml -I$(QTPATH)/include/QtXmlPatterns -I$(QTPATH)/include/QtPrintSupport

 
 INCPATH       = $(INCPATH-$(OS)$(ARCH)-qt$(QTVER)) -I.
 
 
 INCPATH       = $(INCPATH-$(OS)$(ARCH)-qt$(QTVER)) -I.
 


@@ -176,10 +176,10 @@ $(BUILDPATH)/%.o : %.cpp
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 moc_%.cpp : %.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
 moc_%.cpp : %.h

-       moc -qt=$(QTVER) $(DEFINES) $(INCPATH) $< -o $@
+       /usr/bin/moc -qt=$(QTVER) $(DEFINES) $(INCPATH) -o $@ $<

 
 rcc_%.cpp : %.qrc
 
 rcc_%.cpp : %.qrc

-       rcc -qt=$(QTVER) $< -o $@ -name $*
+       /usr/bin/rcc -qt=$(QTVER) $< -o $@ -name $*

 
 ### DEPENDENCIES OF EACH SOURCE FILE (auto-added by configure) ###
 
 
 ### DEPENDENCIES OF EACH SOURCE FILE (auto-added by configure) ###