Mercurial > hg > sonic-visualiser
changeset 1301:26da0e253e68 project-file-rework
Don't -Werror here
| author | Chris Cannam |
|---|---|
| date | Fri, 28 Oct 2016 11:32:22 +0100 |
| parents | f7481cb5a1ff |
| children | d0a7a508ff2e |
| files | convert.pro server.pro |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/convert.pro Fri Oct 28 11:08:17 2016 +0100 +++ b/convert.pro Fri Oct 28 11:32:22 2016 +0100 @@ -15,6 +15,9 @@ macx*: LIBS -= -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate -lbz2 -lz } +# Can't support this flag with the JSON11 and basen modules as they stand +QMAKE_CXXFLAGS -= -Werror + # Using the "console" CONFIG flag above should ensure this happens for # normal Windows builds, but this may be necessary when cross-compiling win32-x-g++: QMAKE_LFLAGS += -Wl,-subsystem,console
--- a/server.pro Fri Oct 28 11:08:17 2016 +0100 +++ b/server.pro Fri Oct 28 11:32:22 2016 +0100 @@ -22,6 +22,9 @@ } } +# Can't support this flag with the JSON11 and basen modules as they stand +QMAKE_CXXFLAGS -= -Werror + # Using the "console" CONFIG flag above should ensure this happens for # normal Windows builds, but this may be necessary when cross-compiling win32-x-g++: QMAKE_LFLAGS += -Wl,-subsystem,console