Merge branch 'dev' into hidpi-icons

2018-12-09 00:13:01 +01:00
parent 5678f33aef 033b021b9b
commit 7ab3893b2b
67 changed files with 611 additions and 601 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -172,7 +172,7 @@ endif()

 if(WIN32)
    set(EXTRA_SRC_CLI myicon.rc)
-    set(EXTRA_SRC_NONCLI myicon.rc windirmonitor.cc)
+    set(EXTRA_SRC_NONCLI myicon.rc)
    set(EXTRA_LIB_RTGUI winmm)
    include_directories(${EXTRA_INCDIR}
        ${GIOMM_INCLUDE_DIRS}