projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read-only sets uses common no write handler
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
3f57fb0
..
84906e6
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-5,6
+5,7
@@
###########################################################
DEBUG=0 # 0 for release, 1 for debug
###########################################################
DEBUG=0 # 0 for release, 1 for debug
+USE_MANIFEST = 1
# TCL is optional - ONLY needed for source straight from Git
TCL="C:\Tcl\bin\tclsh85.exe"
# TCL is optional - ONLY needed for source straight from Git
TCL="C:\Tcl\bin\tclsh85.exe"
@@
-237,11
+238,10
@@
MOD_DOM_CFLAGS=
COMMON_C_OPTIONS= \
/nologo /W3 /EHsc /FD /c \
COMMON_C_OPTIONS= \
/nologo /W3 /EHsc /FD /c \
- /D "WIN32" \
- /D"_CONSOLE" /D"_MBCS" \
/DYAZ_USE_NEW_LOG=1 \
/D"_CRT_SECURE_NO_DEPRECATE" \
/D"_CRT_NONSTDC_NO_DEPRECATE" \
/DYAZ_USE_NEW_LOG=1 \
/D"_CRT_SECURE_NO_DEPRECATE" \
/D"_CRT_NONSTDC_NO_DEPRECATE" \
+ /D "WIN32" \
$(ICONV_DEF) \
$(EXPAT_DEF) \
$(LIBXML2_DEF) \
$(ICONV_DEF) \
$(EXPAT_DEF) \
$(LIBXML2_DEF) \
@@
-269,11
+269,11
@@
COMMON_C_INCLUDES= \
$(BZIP2INCLUDE)
DEBUG_C_OPTIONS= \
$(BZIP2INCLUDE)
DEBUG_C_OPTIONS= \
- /D "_DEBUG" \
- /MDd /Od /YX /Zi /Gm
+ /D "_DEBUG" \
+ /MDd /Od /Zi /Gm
-RELEASE_C_OPTIONS= \
- /D "NDEBUG" \
+RELEASE_C_OPTIONS= \
+ /D "NDEBUG" \
/MD /O2
# /W3 = warning level
/MD /O2
# /W3 = warning level
@@
-295,10
+295,15
@@
RELEASE_C_OPTIONS= \
### Linker options
LINK=link.exe
### Linker options
LINK=link.exe
-LINK_LIBS= kernel32.lib user32.lib gdi32.lib winspool.lib \
- comdlg32.lib advapi32.lib shell32.lib ole32.lib \
- oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
- wsock32.lib advapi32.lib \
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+# wsock32.lib advapi32.lib \
+
+LINK_LIBS= kernel32.lib advapi32.lib \
$(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) $(ICU_LIB)
COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
$(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) $(ICU_LIB)
COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
@@
-339,9
+344,9
@@
LINK_PROGRAM= $(LINK) \
# Generated sources
generate: $(INCLDIR)\idzebra\version.h
# Generated sources
generate: $(INCLDIR)\idzebra\version.h
-$(INCLDIR)\idzebra\version.h:
+$(INCLDIR)\idzebra\version.h: $(ROOTDIR)/IDMETA
@cd $(ROOTDIR)\util
@cd $(ROOTDIR)\util
- $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\idzebra\version.h
+ $(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\idzebra\version.h
# Source and object modules
# Note: Ordinary source files are not specified here at
# Source and object modules
# Note: Ordinary source files are not specified here at
@@
-511,19
+516,16
@@
ZEBRALIB_OBJS= \
# Linking
$(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(IMPLIB)
# Linking
$(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(IMPLIB)
- $(LINK_PROGRAM) \
- $(ZSERVER_OBJS) \
- /out:$(ZSERVER)
+ $(LINK_PROGRAM) $(ZSERVER_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZEBRAIDX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(IMPLIB)
$(ZEBRAIDX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(IMPLIB)
- $(LINK_PROGRAM) \
- $(ZEBRAIDX_OBJS) \
- /out:$(ZEBRAIDX)
+ $(LINK_PROGRAM) $(ZEBRAIDX_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
- $(LINK_PROGRAM) \
- $(TSTFLOCK_OBJS) \
- /out:$(TSTFLOCK)
+ $(LINK_PROGRAM) $(TSTFLOCK_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
# Resources
RES=$(OBJDIR)\zebra.res
# Resources
RES=$(OBJDIR)\zebra.res
@@
-547,10
+549,11
@@
$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES)
$(DLL_LINK_OPTIONS) \
$(ZEBRALIB_OBJS) \
$(RES) \
$(DLL_LINK_OPTIONS) \
$(ZEBRALIB_OBJS) \
$(RES) \
- /out:$(DLL) \
+ /out:$@ \
$(YAZLIB) \
/implib:"$(IMPLIB)" \
$(YAZLIB) \
/implib:"$(IMPLIB)" \
- /map:"$(LIBDIR)\idzebra.map" \
+ /map:"$(LIBDIR)\idzebra.map"
+ $(MT) -manifest $@.manifest -outputresource:$@;2
# Other rules
# Other rules