summaryrefslogtreecommitdiff
path: root/src/Make_cyg.mak
diff options
context:
space:
mode:
Diffstat (limited to 'src/Make_cyg.mak')
-rw-r--r--src/Make_cyg.mak21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index abd35a6a4..ff40548df 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -485,13 +485,32 @@ USE_STDCPLUS = yes
endif
##############################
+ifndef XPM
+ifeq ($(ARCH),i386)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i486)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i586)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i686)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),x86-64)
+XPM = xpm/x64
+endif
+endif
+ifdef XPM
ifneq ($(XPM),no)
# Only allow XPM for a GUI build.
DEFINES += -DFEAT_XPM_W32
-INCLUDES += -I$(XPM)/include
+INCLUDES += -I$(XPM)/include -I$(XPM)/../include
EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
EXTRA_LIBS += -L$(XPM)/lib -lXpm
endif
+endif
##############################
EXE = gvim$(DEBUG_SUFFIX).exe