Hi, Currently we use win32.mak in Make_mvc.mak, however the file is deprecated and not included in the recent Windows SDKs. I think we should stop using win32.mak. Attached patch stops using win32.mak by default. After applying it, win32.mak is used only if SDK_INCLUDE_DIR is defined or USE_WIN32MAK is set to yes.
Regards, Ken Takata -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
# HG changeset patch # Parent f9edcd5338304bf880352a8e1b2128b245cd1e05 diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile --- a/src/GvimExt/Makefile +++ b/src/GvimExt/Makefile @@ -36,8 +36,16 @@ CPU = i386 !ifdef SDK_INCLUDE_DIR !include $(SDK_INCLUDE_DIR)\Win32.mak +!elseif "$(USE_WIN32MAK)"=="yes" +!include <Win32.mak> !else -!include <Win32.mak> +cc = cl +link = link +rc = rc +cflags = -nologo -c +lflags = -incremental:no -nologo +rcflags = /r +olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib !endif # include CPUARG diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -253,12 +253,15 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes !endif -# Get all sorts of useful, standard macros from the Platform SDK. +# Get all sorts of useful, standard macros from the Platform SDK, +# if SDK_INCLUDE_DIR is set or USE_WIN32MAK is set to "yes". !ifdef SDK_INCLUDE_DIR !include $(SDK_INCLUDE_DIR)\Win32.mak +!elseif "$(USE_WIN32MAK)"=="yes" +!include <Win32.mak> !else -!include <Win32.mak> +link = link !endif
