build fixes for win; patch supplied by Douglas E. Engert <deengert@an…

…l.gov> git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3005 c6295689-39f2-0310-b995-f0e70906c6a9
OpenSC · Aug 3, 2006 · aec987d · aec987d
1 parent b5dbdd9
commit aec987d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak
@@ -44,3 +44,4 @@ all: install-headers $(TARGET)
 $(TARGET): $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib
  perl $(TOPDIR)\win32\makedef.pl $*.def $* $(OBJECTS)
  link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) gdi32.lib $(LIBLTDL_LIB) advapi32.lib
+ if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak
@@ -22,9 +22,11 @@ all: install-headers install-headers-dir $(TARGET) $(TARGET2) $(TARGET3)
 
 $(TARGET): $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib
  link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+ if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
 
 $(TARGET2): $(OBJECTS2)
  lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) $(LIBLTDL_LIB)
 
 $(TARGET3): $(OBJECTS3) ..\libopensc\opensc.lib
  link $(LINKFLAGS) /dll /out:$(TARGET3) $(OBJECTS3) ..\libopensc\opensc.lib $(OPENSSL_LIB) $(LIBLTDL_LIB) gdi32.lib advapi32.lib
+ if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2
diff --git a/src/pkcs15init/Makefile.mak b/src/pkcs15init/Makefile.mak
@@ -18,3 +18,4 @@ all: install-headers $(TARGET)
 $(TARGET): $(OBJECTS)
  perl $(TOPDIR)\win32\makedef.pl $*.def $* $(OBJECTS)
  link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\libopensc\opensc.lib winscard.lib $(OPENSSL_LIB) gdi32.lib $(LIBLTDL_LIB)
+ if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
diff --git a/src/tests/Makefile.mak b/src/tests/Makefile.mak
@@ -15,4 +15,5 @@ all: print.obj sc-test.obj $(TARGETS)
  cl $(COPTS) /c $<
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj sc-test.obj print.obj \
  ..\common\common.lib ..\libopensc\opensc.lib $(TOPDIR)\win32\version.res
+ if EXIST [email protected] mt -manifest [email protected] -outputresource:$@;1
 
diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak
@@ -18,10 +18,12 @@ all: util.obj $(TARGETS)
  ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
  ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
  $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+ if EXIST [email protected] mt -manifest [email protected] -outputresource:$@;1
 
 netkey-tool.exe: netkey-tool.c
  cl $(COPTS) /c netkey-tool.c
  link $(LINKFLAGS) /pdb:netkey-tool.pdb /out:netkey-tool.exe netkey-tool.obj \
  ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
  ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
  $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+ if EXIST netkey-tool.exe.manifest mt -manifest netkey-tool.exe.manifest -outputresource:netkey-tool.exe;1