Pass the compiler information from the configure script to the musredit/musrgui configuration
This commit is contained in:
parent
b74a98c71c
commit
84467eae96
@ -1043,9 +1043,10 @@ if test "x$enable_editor" != "xno" && test "x$QMAKEBIN" != "x"; then
|
|||||||
|
|
||||||
echo "Configuring ${QTEDITOR} ..."
|
echo "Configuring ${QTEDITOR} ..."
|
||||||
|
|
||||||
echo "Calling ${QMAKEBIN} PREFIX=${INSTALLDIR} ${QTEDITOR}.pro within the directory src/${QTEDITOR}"
|
echo "Changing directory to src/${QTEDITOR} and calling"
|
||||||
|
echo "${QMAKEBIN} CC=${CC} CXX=${CXX} PREFIX=${INSTALLDIR} ${QTEDITOR}.pro"
|
||||||
cd src/${QTEDITOR}
|
cd src/${QTEDITOR}
|
||||||
${QMAKEBIN} PREFIX=${INSTALLDIR} ${QTEDITOR}.pro
|
${QMAKEBIN} CC=${CC} CXX=${CXX} PREFIX=${INSTALLDIR} ${QTEDITOR}.pro
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
@ -45,8 +45,17 @@ exists( /usr/bin/cygwin1.dll ) {
|
|||||||
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
|
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
|
||||||
}
|
}
|
||||||
|
|
||||||
QMAKE_CC = gcc
|
isEmpty( CC ) {
|
||||||
QMAKE_CXX = g++
|
CC = gcc
|
||||||
|
}
|
||||||
|
|
||||||
|
isEmpty( CXX ) {
|
||||||
|
CXX = g++
|
||||||
|
}
|
||||||
|
|
||||||
|
QMAKE_CC = $${CC}
|
||||||
|
QMAKE_CXX = $${CXX}
|
||||||
|
QMAKE_LINK = $${CXX}
|
||||||
|
|
||||||
# install path for the XML configuration file
|
# install path for the XML configuration file
|
||||||
unix:xml.path = $${MUSREDIT_INSTALL_PATH}
|
unix:xml.path = $${MUSREDIT_INSTALL_PATH}
|
||||||
|
@ -38,8 +38,18 @@ exists( /usr/bin/cygwin1.dll ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
QMAKE_CC = gcc
|
|
||||||
QMAKE_CXX = g++
|
isEmpty( CC ) {
|
||||||
|
CC = gcc
|
||||||
|
}
|
||||||
|
|
||||||
|
isEmpty( CXX ) {
|
||||||
|
CXX = g++
|
||||||
|
}
|
||||||
|
|
||||||
|
QMAKE_CC = $${CC}
|
||||||
|
QMAKE_CXX = $${CXX}
|
||||||
|
QMAKE_LINK = $${CXX}
|
||||||
|
|
||||||
# install path for the XML configuration file
|
# install path for the XML configuration file
|
||||||
unix:xml.path = $${MUSRGUI_INSTALL_PATH}
|
unix:xml.path = $${MUSRGUI_INSTALL_PATH}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user