aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2019-11-29 10:09:00 +0000
committerxiphon <xiphon@protonmail.com>2019-12-09 22:49:42 +0000
commit2833fdb90790dd0c25c9bb176fa373ff99ebfdff (patch)
tree799bdd7ef6e06b43555df3c23f870a84f73a6f13 /src
parent17ea26e02a925059f61bd35b8c90340d4eefadda (diff)
downloadmonzero-gui-2833fdb90790dd0c25c9bb176fa373ff99ebfdff.tar.gz
monzero-gui-2833fdb90790dd0c25c9bb176fa373ff99ebfdff.tar.xz
monzero-gui-2833fdb90790dd0c25c9bb176fa373ff99ebfdff.zip
cmake: use appropriate compiler flags
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/main/main.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c66a15c..6485cdc3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,8 +113,8 @@ target_compile_definitions(monero-gui
${Qt5Qml_DEFINITIONS}
)
-set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-set(CMAKE_CXX_FLAGS "-std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
if(X11_FOUND)
target_link_libraries(monero-gui ${X11_LIBRARIES} pthread dl Xt xcb X11)
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 138c2889..6b0a8744 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -92,7 +92,6 @@ Q_IMPORT_PLUGIN(QSvgIconPlugin)
Q_IMPORT_PLUGIN(QGifPlugin)
Q_IMPORT_PLUGIN(QICNSPlugin)
Q_IMPORT_PLUGIN(QICOPlugin)
-Q_IMPORT_PLUGIN(QJp2Plugin)
Q_IMPORT_PLUGIN(QJpegPlugin)
Q_IMPORT_PLUGIN(QMngPlugin)
Q_IMPORT_PLUGIN(QSvgPlugin)