diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro index d9e5816c4..916bc6ca5 100644 --- a/libbitdht/src/libbitdht.pro +++ b/libbitdht/src/libbitdht.pro @@ -69,14 +69,14 @@ win32 { QMAKE_CXXFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += } ################################# MacOSX ########################################## diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index fa9491c63..9063efd43 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -27,7 +27,7 @@ debug { # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG - QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer + QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer } @@ -251,14 +251,14 @@ win32-g++ { QMAKE_CXXFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += DEFINES += USE_CMD_ARGS diff --git a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro index 8fa292c61..cfa6a7d83 100644 --- a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro +++ b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro @@ -53,7 +53,7 @@ debug { # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG - QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer + QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer } ################################# Linux ########################################## @@ -100,14 +100,14 @@ win32 { QMAKE_CXXFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS += ../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a diff --git a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro index d95c4bcd4..82f921fc8 100644 --- a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro +++ b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro @@ -36,7 +36,7 @@ debug { # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG - QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer + QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer } ################################# Linux ########################################## @@ -85,14 +85,14 @@ win32 { QMAKE_CXXFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS += ../../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a diff --git a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro index 8fa292c61..cfa6a7d83 100644 --- a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro +++ b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro @@ -53,7 +53,7 @@ debug { # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG - QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer + QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer } ################################# Linux ########################################## @@ -100,14 +100,14 @@ win32 { QMAKE_CXXFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS += ../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index f667a0d23..5975a7bfb 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -26,10 +26,10 @@ win32-g++ { DEFINES *= WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += mLibs = bz2 z ssl crypto static { diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index c6124862c..8a322aae4 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -49,14 +49,14 @@ win32 { # DESTDIR = lib # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += DEFINES += USE_CMD_ARGS diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 30b2af946..1a721643e 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -170,14 +170,14 @@ win32-g++ { QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += OBJECTS_DIR = temp/obj diff --git a/retroshare.pri b/retroshare.pri index c4f47aedf..6b1f0961f 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -308,11 +308,11 @@ rs_chatserver { } debug { - QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer - QMAKE_CFLAGS -= -O2 -fomit-frame-pointer + QMAKE_CXXFLAGS -= -fomit-frame-pointer + QMAKE_CFLAGS -= -fomit-frame-pointer - QMAKE_CXXFLAGS *= -O0 -g -fno-omit-frame-pointer - QMAKE_CFLAGS *= -O0 -g -fno-omit-frame-pointer + QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer + QMAKE_CFLAGS *= -g -fno-omit-frame-pointer } profiling { diff --git a/supportlibs/pegmarkdown/pegmarkdown.pro b/supportlibs/pegmarkdown/pegmarkdown.pro index cc21ccaf3..9fc25562c 100644 --- a/supportlibs/pegmarkdown/pegmarkdown.pro +++ b/supportlibs/pegmarkdown/pegmarkdown.pro @@ -10,7 +10,7 @@ QMAKE_CC = gcc #CONFIG += debug debug { - QMAKE_CFLAGS -= -O2 + QMAKE_CFLAGS -= QMAKE_CFLAGS *= -g } @@ -39,8 +39,8 @@ win32 { QMAKE_CFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += CONFIG += dummy_glib diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro index 94c942f53..e7432ca38 100644 --- a/tests/librssimulator/librssimulator.pro +++ b/tests/librssimulator/librssimulator.pro @@ -14,7 +14,7 @@ profiling { debug { - QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer + QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer } @@ -159,14 +159,14 @@ win32 { QMAKE_CXXFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += DEFINES += USE_CMD_ARGS diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro index d95c4bcd4..82f921fc8 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro +++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro @@ -36,7 +36,7 @@ debug { # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG - QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer + QMAKE_CXXFLAGS -= -fomit-frame-pointer QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer } ################################# Linux ########################################## @@ -85,14 +85,14 @@ win32 { QMAKE_CXXFLAGS += -Wextra # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a PRE_TARGETDEPS += ../../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a diff --git a/tests/unittests/unittests.pro b/tests/unittests/unittests.pro index c17be5b77..6721f39d7 100644 --- a/tests/unittests/unittests.pro +++ b/tests/unittests/unittests.pro @@ -120,14 +120,14 @@ win32 { QMAKE_LFLAGS += -Wl,--start-group # Switch off optimization for release version - QMAKE_CXXFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE += -O0 - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CFLAGS_RELEASE += -O0 + QMAKE_CXXFLAGS_RELEASE -= + QMAKE_CXXFLAGS_RELEASE += + QMAKE_CFLAGS_RELEASE -= + QMAKE_CFLAGS_RELEASE += # Switch on optimization for debug version - #QMAKE_CXXFLAGS_DEBUG += -O2 - #QMAKE_CFLAGS_DEBUG += -O2 + #QMAKE_CXXFLAGS_DEBUG += + #QMAKE_CFLAGS_DEBUG += OBJECTS_DIR = temp/obj #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"