Mercurial > hg > svcore
changeset 657:1bb85de8c5b9
* Add qmake config (debug or release) corresponding to configure invocation
| author | Chris Cannam |
|---|---|
| date | Fri, 08 Oct 2010 13:30:47 +0100 |
| parents | 34dad3ed923a |
| children | 29efe322ab47 |
| files | config.pri.in configure configure.ac |
| diffstat | 3 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/config.pri.in Fri Oct 08 12:05:40 2010 +0100 +++ b/config.pri.in Fri Oct 08 13:30:47 2010 +0100 @@ -1,8 +1,11 @@ + +CONFIG += @QMAKE_CONFIG@ DEFINES += @HAVES@ QMAKE_CC = @CC@ QMAKE_CXX = @CXX@ +QMAKE_LINK = @CXX@ QMAKE_CFLAGS += @CFLAGS@ QMAKE_CXXFLAGS += @CXXFLAGS@ @@ -10,7 +13,7 @@ linux*:LIBS += -lasound macx*:DEFINES += HAVE_QUICKTIME -macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox +macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices LIBS += @LIBS@
--- a/configure Fri Oct 08 12:05:40 2010 +0100 +++ b/configure Fri Oct 08 13:30:47 2010 +0100 @@ -597,6 +597,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS CODENAME +QMAKE_CONFIG HAVES CXXFLAGS_MINIMAL CUT @@ -4183,10 +4184,13 @@ CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" SV_DEFINES_BUILD="$SV_DEFINES_RELEASE" +QMAKE_CONFIG="release" + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : enableval=$enable_debug; { $as_echo "$as_me:${as_lineno-$LINENO}: enabling debug build" >&5 $as_echo "$as_me: enabling debug build" >&6;} +QMAKE_CONFIG="debug" CXXFLAGS_BUILD="$CXXFLAGS_DEBUG" SV_DEFINES_BUILD="$SV_DEFINES_DEBUG" fi @@ -7196,6 +7200,8 @@ + + ac_config_files="$ac_config_files config.pri" cat >confcache <<\_ACEOF
--- a/configure.ac Fri Oct 08 12:05:40 2010 +0100 +++ b/configure.ac Fri Oct 08 13:30:47 2010 +0100 @@ -51,7 +51,10 @@ CXXFLAGS_BUILD="$CXXFLAGS_RELEASE" SV_DEFINES_BUILD="$SV_DEFINES_RELEASE" +QMAKE_CONFIG="release" + AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable debug support [default=no]])],[AC_MSG_NOTICE([enabling debug build]) +QMAKE_CONFIG="debug" CXXFLAGS_BUILD="$CXXFLAGS_DEBUG" SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"]) @@ -101,6 +104,8 @@ AC_SUBST(CC) AC_SUBST(CXX) +AC_SUBST(QMAKE_CONFIG) + AC_SUBST(CODENAME) AC_OUTPUT([config.pri])