diff options
Diffstat (limited to 'win32/Makefile.msvc')
| -rw-r--r-- | win32/Makefile.msvc | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 2712a0ad..e3d5262e 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -148,12 +148,12 @@ XMLSEC_OBJS = \ $(XMLSEC_INTDIR)\membuf.obj \ $(XMLSEC_INTDIR)\nodeset.obj \ $(XMLSEC_INTDIR)\parser.obj \ + $(XMLSEC_INTDIR)\relationship.obj \ $(XMLSEC_INTDIR)\soap.obj \ $(XMLSEC_INTDIR)\strings.obj \ $(XMLSEC_INTDIR)\templates.obj \ $(XMLSEC_INTDIR)\transforms.obj \ $(XMLSEC_INTDIR)\x509.obj \ - $(XMLSEC_INTDIR)\xkms.obj \ $(XMLSEC_INTDIR)\xmldsig.obj \ $(XMLSEC_INTDIR)\xmlenc.obj \ $(XMLSEC_INTDIR)\xmlsec.obj \ @@ -179,12 +179,12 @@ XMLSEC_OBJS_A = \ $(XMLSEC_INTDIR_A)\membuf.obj \ $(XMLSEC_INTDIR_A)\nodeset.obj \ $(XMLSEC_INTDIR_A)\parser.obj \ + $(XMLSEC_INTDIR_A)\relationship.obj \ $(XMLSEC_INTDIR_A)\soap.obj \ $(XMLSEC_INTDIR_A)\strings.obj \ $(XMLSEC_INTDIR_A)\templates.obj \ $(XMLSEC_INTDIR_A)\transforms.obj \ $(XMLSEC_INTDIR_A)\x509.obj \ - $(XMLSEC_INTDIR_A)\xkms.obj \ $(XMLSEC_INTDIR_A)\xmldsig.obj \ $(XMLSEC_INTDIR_A)\xmlenc.obj \ $(XMLSEC_INTDIR_A)\xmlsec.obj \ @@ -334,7 +334,7 @@ CFLAGS = $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1 !else !endif -APP_CFLAGS = /D "XMLSEC_CRYPTO=\"$(XMLSEC_CRYPTO)\"" +APP_CFLAGS = /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\"" !if "$(WITH_DL)" == "1" CFLAGS = $(CFLAGS) /D "XMLSEC_DL_WIN32" APP_CFLAGS = $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING" @@ -346,12 +346,12 @@ APP_CFLAGS = $(APP_CFLAGS) /D "XMLSEC_NO_TMPL_TEST" !endif !if "$(WITH_OPENSSL_VERSION)" == "" -XMLSEC_OPENSSL_CFLAGS = /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_CRYPTO=\"openssl\"" +XMLSEC_OPENSSL_CFLAGS = /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_DEFAULT_CRYPTO=\"openssl\"" !else -XMLSEC_OPENSSL_CFLAGS = /D "$(WITH_OPENSSL_VERSION)" /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_CRYPTO=\"openssl\"" +XMLSEC_OPENSSL_CFLAGS = /D "$(WITH_OPENSSL_VERSION)" /D "XMLSEC_CRYPTO_OPENSSL" /D "XMLSEC_DEFAULT_CRYPTO=\"openssl\"" !endif -XMLSEC_NSS_CFLAGS = /D "XMLSEC_CRYPTO_NSS" /D "XMLSEC_CRYPTO=\"nss\"" -XMLSEC_MSCRYPTO_CFLAGS = /D "XMLSEC_CRYPTO_MSCRYPTO" /D "XMLSEC_CRYPTO=\"mscrypto\"" +XMLSEC_NSS_CFLAGS = /D "XMLSEC_CRYPTO_NSS" /D "XMLSEC_DEFAULT_CRYPTO=\"nss\"" +XMLSEC_MSCRYPTO_CFLAGS = /D "XMLSEC_CRYPTO_MSCRYPTO" /D "XMLSEC_DEFAULT_CRYPTO=\"mscrypto\"" # # The linker and its options. @@ -410,33 +410,33 @@ ARFLAGS = /nologo # xmlsec-<default-crypto> options # !if "$(WITH_DEFAULT_CRYPTO)" == "openssl" -XMLSEC_CRYPTO = "openssl" +XMLSEC_DEFAULT_CRYPTO = "openssl" XMLSEC_CRYPTO_CFLAGS = $(XMLSEC_OPENSSL_CFLAGS) XMLSEC_CRYPTO_SOLIBS = $(XMLSEC_OPENSSL_SOLIBS) XMLSEC_CRYPTO_ALIBS = $(XMLSEC_OPENSSL_ALIBS) XMLSEC_CRYPTO_SO = $(XMLSEC_OPENSSL_SO) -XMLSEC_CRYPTO_IMP = $(XMLSEC_OPENSSL_IMP) -XMLSEC_CRYPTO_A = $(XMLSEC_OPENSSL_A) +XMLSEC_CRYPTO_IMP = $(XMLSEC_OPENSSL_IMP) +XMLSEC_CRYPTO_A = $(XMLSEC_OPENSSL_A) !endif !if "$(WITH_DEFAULT_CRYPTO)" == "nss" -XMLSEC_CRYPTO = "nss" +XMLSEC_DEFAULT_CRYPTO = "nss" XMLSEC_CRYPTO_CFLAGS = $(XMLSEC_NSS_CFLAGS) XMLSEC_CRYPTO_SOLIBS = $(XMLSEC_NSS_SOLIBS) XMLSEC_CRYPTO_ALIBS = $(XMLSEC_NSS_ALIBS) XMLSEC_CRYPTO_SO = $(XMLSEC_NSS_SO) -XMLSEC_CRYPTO_IMP = $(XMLSEC_NSS_IMP) -XMLSEC_CRYPTO_A = $(XMLSEC_NSS_A) +XMLSEC_CRYPTO_IMP = $(XMLSEC_NSS_IMP) +XMLSEC_CRYPTO_A = $(XMLSEC_NSS_A) !endif !if "$(WITH_DEFAULT_CRYPTO)" == "mscrypto" -XMLSEC_CRYPTO = "mscrypto" +XMLSEC_DEFAULT_CRYPTO = "mscrypto" XMLSEC_CRYPTO_CFLAGS = $(XMLSEC_MSCRYPTO_CFLAGS) XMLSEC_CRYPTO_SOLIBS = $(XMLSEC_MSCRYPTO_SOLIBS) XMLSEC_CRYPTO_ALIBS = $(XMLSEC_MSCRYPTO_ALIBS) XMLSEC_CRYPTO_SO = $(XMLSEC_MSCRYPTO_SO) -XMLSEC_CRYPTO_IMP = $(XMLSEC_MSCRYPTO_IMP) -XMLSEC_CRYPTO_A = $(XMLSEC_MSCRYPTO_A) +XMLSEC_CRYPTO_IMP = $(XMLSEC_MSCRYPTO_IMP) +XMLSEC_CRYPTO_A = $(XMLSEC_MSCRYPTO_A) !endif # @@ -480,13 +480,6 @@ check-enc : $(BINDIR)\$(APP_NAME) sh ./tests/testrun.sh ./tests/testEnc.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der cd win32 -check-xkms : $(BINDIR)\$(APP_NAME) - cd .. - if not exist win32\tmp mkdir win32\tmp - set TMPFOLDER=win32\tmp - sh ./tests/testrun.sh ./tests/testXKMS.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der - cd win32 - clean : if exist $(XMLSEC_INTDIR) rmdir /S /Q $(XMLSEC_INTDIR) if exist $(XMLSEC_INTDIR_A) rmdir /S /Q $(XMLSEC_INTDIR_A) |