mirror of
https://github.com/ra3xdh/qucs_s
synced 2025-03-28 21:13:26 +00:00
various changes to build system
This commit is contained in:
Guilherme Brondani Torri
parent
bdcd3195f1
commit
54ca0244e9
@ -10,6 +10,7 @@ SET( QT_USE_QT TRUE )
|
||||
SET( QT_USE_QTCORE TRUE )
|
||||
SET( QT_USE_QTGUI TRUE )
|
||||
SET( QT_USE_QT3SUPPORT TRUE )
|
||||
SET( QT_USE_QTSCRIPT TRUE )
|
||||
|
||||
SET( QT_DEBUG TRUE)
|
||||
|
||||
|
||||
14
configure.ac
14
configure.ac
@ -152,7 +152,7 @@ case $host_os in
|
||||
/usr/X11R6/include/qt4 $prefix/include/qt4"
|
||||
for path in $paths; do
|
||||
if test -f "$path/Qt/qapplication.h"; then
|
||||
QT_INCLUDES="$path -I$path/Qt -I$path/QtGui -I$path/QtCore -I$path/QtSvg -I$path/QtXml"
|
||||
QT_INCLUDES="$path -I$path/Qt -I$path/QtGui -I$path/QtCore -I$path/QtSvg -I$path/QtXml -I$path/QtScript"
|
||||
QT_INCLUDES="$QT_INCLUDES -I$path/Qt3Support"
|
||||
QT_VER=4
|
||||
break
|
||||
@ -178,7 +178,7 @@ case $host_os in
|
||||
fi])
|
||||
if test "$enable_mt" = yes; then
|
||||
QT_LDF=""
|
||||
QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg"
|
||||
QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg -lQtScript"
|
||||
QT_INC="$QT_DEF -DQT3_SUPPORT -DQT_THREAD_SUPPORT -D_REENTRANT"
|
||||
[case $host_os in
|
||||
*freebsd4*) QT_LIB="$QT_LIB -pthread" ;;
|
||||
@ -188,13 +188,13 @@ case $host_os in
|
||||
QT_MTS="multi-threaded"
|
||||
else
|
||||
QT_LDF=""
|
||||
QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg"
|
||||
QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg -lQtScript"
|
||||
QT_INC="$QT_DEF"
|
||||
QT_MTS="non-threaded"
|
||||
fi
|
||||
case $host_os in
|
||||
*mingw*)
|
||||
QT_LIB="-lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4 -lQtSvg4"
|
||||
QT_LIB="-lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4 -lQtSvg4 -lQtScript"
|
||||
QT_INC="$QT_INC -DQT_DLL -DUNICODE"
|
||||
QT_LDF="$QT_LDF -mwindows"
|
||||
;;
|
||||
@ -281,12 +281,14 @@ case $host_os in
|
||||
|
||||
if test "x${with_qt}" = xyes ; then
|
||||
AC_MSG_RESULT([found in $path])
|
||||
QT_LIBS="-framework QtGui -framework QtCore -framework QtXml -framework Qt3Support -framework QtSvg"
|
||||
QT_LIBS="-framework QtGui -framework QtCore -framework QtXml -framework QtSvg -framework QtScript"
|
||||
QT_LIBS="$QT_LIBS -framework Qt3Support"
|
||||
CPPFLAGS="$CPPFLAGS -I$path/QtCore.framework/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$path/QtGui.framework/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$path/QtXml.framework/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$path/Qt3Support.framework/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$path/QtSvg.framework/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$path/QtScript.framework/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$path/Qt3Support.framework/Headers"
|
||||
QT_CFLAGS="$CPPFLAGS"
|
||||
else
|
||||
AC_MSG_ERROR([not found])
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# automatically, set the CMAKE_PREFIX_PATH environment variable.
|
||||
# For example: "export CMAKE_PREFIX_PATH=/usr/local/trolltech/qt4.3.5"
|
||||
#
|
||||
# You can change the install location by
|
||||
# You can change the install location by
|
||||
# running cmake like this:
|
||||
# mkdir build; cd build
|
||||
# cmake .. -DCMAKE_INSTALL_PREFIX=/new/install/prefix
|
||||
@ -54,7 +54,7 @@ CONFIGURE_FILE (
|
||||
INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
|
||||
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
|
||||
|
||||
FIND_PACKAGE( Qt4 4.6.3 REQUIRED QtCore QtGui Qt3Support QtSvg QtXml )
|
||||
FIND_PACKAGE( Qt4 4.6.3 REQUIRED QtCore QtGui Qt3Support QtSvg QtXml QtScript)
|
||||
INCLUDE( ${QT_USE_FILE} )
|
||||
|
||||
MESSAGE("QT_LIBRARIES=[${QT_LIBRARIES}]")
|
||||
@ -66,9 +66,9 @@ IF(WIN32)
|
||||
LINK_DIRECTORIES("${QT_BINARY_DIR}")
|
||||
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(QT_LIBRARIES QtCored4 QtGuid4 Qt3Supportd4 QtSvgd4 QtXmld4)
|
||||
set(QT_LIBRARIES QtCored4 QtGuid4 Qt3Supportd4 QtSvgd4 QtXmld4 QtScriptd4)
|
||||
else()
|
||||
set(QT_LIBRARIES QtCore4 QtGui4 Qt3Support4 QtSvg4 QtXml4)
|
||||
set(QT_LIBRARIES QtCore4 QtGui4 Qt3Support4 QtSvg4 QtXml4 QtScript4)
|
||||
ENDIF()
|
||||
ENDIF(WIN32)
|
||||
|
||||
|
||||
@ -15,8 +15,8 @@ ac_sim.cpp dmux2to4.cpp logical_xnor.cpp rfedd2p.cpp
|
||||
am_modulator.cpp dmux3to8.cpp logical_xor.cpp rlcg.cpp
|
||||
ampere_ac.cpp dmux4to16.cpp mod_amp.cpp rs_flipflop.cpp
|
||||
ampere_dc.cpp ecvs.cpp
|
||||
eqndefined.cpp #module.cpp
|
||||
source_ac.cpp
|
||||
eqndefined.cpp #module.cpp
|
||||
source_ac.cpp
|
||||
ampere_noise.cpp equation.cpp mosfet.cpp sp_sim.cpp
|
||||
amplifier.cpp etr_sim.cpp
|
||||
fa1b.cpp mosfet_sub.cpp sparamfile.cpp
|
||||
@ -53,8 +53,9 @@ d_flipflop.cpp log_amp.cpp phaseshifter.cpp vpulse.cpp
|
||||
dc_sim.cpp logic_0.cpp photodiode.cpp vrect.cpp
|
||||
dcblock.cpp logic_1.cpp phototransistor.cpp
|
||||
dcfeed.cpp logical_and.cpp pm_modulator.cpp
|
||||
bsim4v30nMOS.cpp
|
||||
bsim4v30pMOS.cpp
|
||||
bsim4v30nMOS.cpp
|
||||
bsim4v30pMOS.cpp
|
||||
vacomponent.cpp
|
||||
)
|
||||
|
||||
SET(COMPONENTS_MOC_HDRS
|
||||
|
||||
@ -60,7 +60,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
|
||||
hpribin4bit.cpp msrstub.cpp phototransistor.cpp nigbt.cpp hicumL2V2p24.cpp \
|
||||
hicumL0V1p2g.cpp hybrid.cpp ctline.cpp tunneldiode.cpp hicumL0V1p3.cpp \
|
||||
hicumL2V2p31n.cpp bsim3v34nMOS.cpp bsim3v34pMOS.cpp bsim4v30nMOS.cpp \
|
||||
bsim4v30pMOS.cpp etr_sim.cpp ecvs.cpp vcresistor.cpp
|
||||
bsim4v30pMOS.cpp etr_sim.cpp ecvs.cpp vcresistor.cpp vacomponent.cpp
|
||||
|
||||
nodist_libcomponents_a_SOURCES = $(MOCFILES)
|
||||
|
||||
@ -90,7 +90,7 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
|
||||
comp_2bit.h comp_4bit.h hpribin4bit.h msrstub.h phototransistor.h nigbt.h \
|
||||
vafile.h hicumL2V2p24.h hicumL0V1p2g.h hybrid.h ctline.h tunneldiode.h \
|
||||
hicumL0V1p3.h hicumL2V2p31n.h bsim3v34nMOS.h bsim3v34pMOS.h bsim4v30nMOS.h \
|
||||
bsim4v30pMOS.h etr_sim.h ecvs.h vcresistor.h
|
||||
bsim4v30pMOS.h etr_sim.h ecvs.h vcresistor.h vacomponent.h
|
||||
|
||||
AM_CPPFLAGS = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user