From c4ddd42cd68835df607e539eb1514133b1f77ba9 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Wed, 15 Apr 2015 11:05:28 +0200 Subject: [PATCH] adjust unarr flags to be closer to the upstream makefile --- .../compressed_archive_test/compressed_archive_test.pro | 9 +++++---- tests/compressed_archive_test/main.cpp | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/compressed_archive_test/compressed_archive_test.pro b/tests/compressed_archive_test/compressed_archive_test.pro index 46a1e906..dd9691b0 100644 --- a/tests/compressed_archive_test/compressed_archive_test.pro +++ b/tests/compressed_archive_test/compressed_archive_test.pro @@ -16,8 +16,8 @@ win32 { unix { #these flags are probably redundant #qmake tends to chose it's own flags and ignores system wide flags on unix - QMAKE_CXXFLAGS+= -O2 -pipe -Wall -pthread -std=c++11 - QMAKE_CFLAGS+= -O2 -pipe -Wall -pthread + QMAKE_CXXFLAGS+= -std=c++11 -O2 -pipe -Wall -fomit-frame-pointer + QMAKE_CFLAGS+= -O2 -pipe -Wall -fomit-frame-pointer #this might need a little tweaking on mac os !CONFIG(unarr){ @@ -26,9 +26,10 @@ unix { else{ #make unarr use system zlib and bzip2 #these are pretty much standard on unix - DEFINES += HAVE_ZLIB HAVE_BZIP2 + DEFINES += HAVE_ZLIB HAVE_BZIP2 NDEBUG #add zlib and bz2 to libs - LIBS += -lbz2 -lz + #we also need libm for mathematics + LIBS += -lbz2 -lz -lm } } diff --git a/tests/compressed_archive_test/main.cpp b/tests/compressed_archive_test/main.cpp index a2024a2a..f2686a51 100644 --- a/tests/compressed_archive_test/main.cpp +++ b/tests/compressed_archive_test/main.cpp @@ -25,7 +25,7 @@ int main(int argc, char *argv[]) return 0; } - QCoreApplication app(argc, argv); + //QCoreApplication app(argc, argv); QString s(argv[1]);