merge with dev

2018-12-11 07:40:54 +01:00
parent bfca2e2dd6 516be46550
commit d0029e81a4
99 changed files with 2409 additions and 1833 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}