Commits

equalsraf committed ae6f32c

Fix windows clipboard after upstream merge

- When merging with upstream -892 the build for
windows broke down because some of the clipboard code
moved out os_win32.c to winclip.c.
- This commit updates CMakeLists.txt with winclip.c and
fixes some missing defines that went unchecked in the
merge.

  • Participants
  • Parent commits 5011146

Comments (0)

Files changed (2)

File src/CMakeLists.txt

 
 	set(VIM_SOURCES ${VIM_SOURCES} 
 			os_win32.c 
+			winclip.c
 			os_mswin.c)
 
 	add_definitions(-DWIN32

File src/os_win32.c

     if (!executable_exists("findstr.exe"))
 	set_option_value((char_u *)"grepprg", 0, (char_u *)"grep -n", 0);
 
-#ifdef FEAT_CLIPBOARD
+#if defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI_QT)
     win_clip_init();
-#endif
+#endif /* FEAT_CLIPBOARD && !FEAT_GUI_QT */
 }
 
 
     g_fMouseAvail = GetSystemMetrics(SM_MOUSEPRESENT);
 #endif
 
-#ifdef FEAT_CLIPBOARD
+#if defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI_QT)
     win_clip_init();
-#endif
+#endif /* FEAT_CLIPBOARD && !FEAT_GUI_QT */
 
     /* This will be NULL on anything but NT 4.0 */
     s_pfnGetConsoleKeyboardLayoutName =