projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use `=>ucs' instead of `->ucs'.
[chise/xemacs-chise.git-]
/
nt
/
xpm.mak
diff --git
a/nt/xpm.mak
b/nt/xpm.mak
index
1ebdb88
..
2adc736
100644
(file)
--- a/
nt/xpm.mak
+++ b/
nt/xpm.mak
@@
-1,21
+1,44
@@
#
# XPM Makefile for Microsoft NMAKE without X libraries
#
#
# XPM Makefile for Microsoft NMAKE without X libraries
#
+!if !defined(DEBUG)
+!if defined(DEBUG_XEMACS)
+DEBUG=$(DEBUG_XEMACS)
+!else
+DEBUG=0
+!endif
+!endif
-!if !defined(DEBUG_XEMACS)
-DEBUG_XEMACS=0
+!if !defined(USE_CRTDLL)
+USE_CRTDLL=0
!endif
!endif
-!if $(DEBUG_XEMACS)
+!if $(DEBUG)
OPT=-Od -Zi
OPT=-Od -Zi
+LINK_DEBUG=-debug
+!else
+OPT=-Ox
+!endif
+
+!if $(USE_CRTDLL)
+!if $(DEBUG)
+C_LIBFLAG=-MDd
!else
!else
-OPT=-O2 -G5 -Zi
+C_LIBFLAG=-MD
+!endif
+!else
+!if $(DEBUG)
+C_LIBFLAG=-MLd
+!else
+C_LIBFLAG=-ML
+!endif
!endif
WARN_CPP_FLAGS = -W3
CC=cl
!endif
WARN_CPP_FLAGS = -W3
CC=cl
-CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) -Fo$@ -c
+CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \
+ $(OPT) $(INCLUDES) -c
OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \
OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \
@@
-29,8
+52,8
@@
OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
.SUFFIXES:
.SUFFIXES: .c
.SUFFIXES:
.SUFFIXES: .c
-.c.obj:
- $(CC) $(CFLAGS) $< -Fo$@
+.c.obj::
+ $(CC) $(CFLAGS) $<
# targets
# targets
@@
-44,4
+67,9
@@
all: ..\X11\xpm.h Xpm.lib
mkdir ..\X11
Xpm.lib: $(OBJS)
mkdir ..\X11
Xpm.lib: $(OBJS)
- link.exe -lib -nologo -out:$@ $(OBJS)
+!if $(USE_CRTDLL)
+# Target is ok, link builds lib as a side effect.
+ link -nologo -dll -def:xpm.def -out:Xpm.dll gdi32.lib $(OBJS)
+!else
+ lib -nologo -out:$@ $(OBJS)
+!endif