diff options
Diffstat (limited to '')
| -rw-r--r-- | src/GvimExt/Make_ming.mak | 4 | ||||
| -rw-r--r-- | src/GvimExt/Make_mvc.mak | 25 |
2 files changed, 13 insertions, 16 deletions
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index 85017d8..06ec7b6 100644 --- a/src/GvimExt/Make_ming.mak +++ b/src/GvimExt/Make_ming.mak @@ -29,7 +29,7 @@ LDFLAGS += -static-libgcc -static-libstdc++ endif ifeq ($(CROSS),yes) -DEL = rm +DEL = rm -f ifeq ($(MINGWOLD),yes) CXXFLAGS := -O2 -fvtable-thunks else @@ -38,7 +38,7 @@ endif else CXXFLAGS := -O2 ifneq (sh.exe, $(SHELL)) -DEL = rm +DEL = rm -f else DEL = del endif diff --git a/src/GvimExt/Make_mvc.mak b/src/GvimExt/Make_mvc.mak index 7068d8f..132a584 100644 --- a/src/GvimExt/Make_mvc.mak +++ b/src/GvimExt/Make_mvc.mak @@ -19,25 +19,24 @@ WINVER = 0x0601 NODEBUG = 1 !endif -!ifdef PROCESSOR_ARCHITECTURE -# On Windows NT -! ifndef CPU +!ifndef CPU CPU = i386 -! if !defined(PLATFORM) && defined(TARGET_CPU) +! ifndef PLATFORM +! ifdef TARGET_CPU PLATFORM = $(TARGET_CPU) +! elseif defined(VSCMD_ARG_TGT_ARCH) +PLATFORM = $(VSCMD_ARG_TGT_ARCH) ! endif -! ifdef PLATFORM -! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64") +! endif +! ifdef PLATFORM +! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64") CPU = AMD64 -! elseif ("$(PLATFORM)" == "arm64") || ("$(PLATFORM)" == "ARM64") +! elseif ("$(PLATFORM)" == "arm64") || ("$(PLATFORM)" == "ARM64") CPU = ARM64 -! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86") -! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted. -! endif +! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86") +! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted. ! endif ! endif -!else -CPU = i386 !endif !ifdef SDK_INCLUDE_DIR @@ -80,7 +79,6 @@ all: gvimext.dll gvimext.dll: gvimext.obj \ gvimext.res $(link) $(lflags) -dll -def:gvimext.def -base:$(OFFSET) -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib -subsystem:$(SUBSYSTEM) - if exist $*.dll.manifest mt -nologo -manifest $*.dll.manifest -outputresource:$*.dll;2 gvimext.obj: gvimext.h @@ -96,4 +94,3 @@ clean: - if exist gvimext.exp del gvimext.exp - if exist gvimext.obj del gvimext.obj - if exist gvimext.res del gvimext.res - - if exist gvimext.dll.manifest del gvimext.dll.manifest |