summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Chantereay <rchantereau@entrouvert.com>2005-02-08 19:28:11 +0000
committerRomain Chantereay <rchantereau@entrouvert.com>2005-02-08 19:28:11 +0000
commit4556818cc32ab68aa4815a541e562f2bb7687c8d (patch)
treeb0bf6f465de9190aecd2ca66f1867f127e56383f
parent3fc96e5832d407d6b98bf11329bb4b7bdfb46ea7 (diff)
downloadlasso-4556818cc32ab68aa4815a541e562f2bb7687c8d.tar.gz
lasso-4556818cc32ab68aa4815a541e562f2bb7687c8d.tar.xz
lasso-4556818cc32ab68aa4815a541e562f2bb7687c8d.zip
Removed XMLSEC_DYNAMIC_LOADING because it is a non-sense.
We are using xmlsec-openssl specific functions in code, so there is no choice, we have to use openssl. (Fix a build warning).
-rw-r--r--win32/msvc/lasso.dsp4
-rw-r--r--win32/msvc/php/php.dsp2
2 files changed, 3 insertions, 3 deletions
diff --git a/win32/msvc/lasso.dsp b/win32/msvc/lasso.dsp
index d334263e..e77ded90 100644
--- a/win32/msvc/lasso.dsp
+++ b/win32/msvc/lasso.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LASSO_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "..\.." /I ".." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LASSO" /D XMLSEC_CRYPTO=\"openssl\" /D XMLSEC_CRYPTO_DYNAMIC_LOADING=1 /D XMLSEC_LIBXML_260=1 /D XMLSEC_NO_XKMS=1 /D XMLSEC_CRYPTO_OPENSSL=1 /D "LASSO_INTERNALS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "..\.." /I ".." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LASSO" /D XMLSEC_CRYPTO=\"openssl\" /D XMLSEC_LIBXML_260=1 /D XMLSEC_NO_XKMS=1 /D XMLSEC_CRYPTO_OPENSSL=1 /D "LASSO_INTERNALS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LASSO_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "lasso" /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "..\.." /I ".." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LASSO" /D XMLSEC_CRYPTO=\"openssl\" /D XMLSEC_CRYPTO_DYNAMIC_LOADING=1 /D XMLSEC_LIBXML_260=1 /D XMLSEC_NO_XKMS=1 /D XMLSEC_CRYPTO_OPENSSL=1 /D "LASSO_INTERNALS" /D "LASSO_DEBUG" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "lasso" /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "..\.." /I ".." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IN_LASSO" /D XMLSEC_CRYPTO=\"openssl\" /D XMLSEC_LIBXML_260=1 /D XMLSEC_NO_XKMS=1 /D XMLSEC_CRYPTO_OPENSSL=1 /D "LASSO_INTERNALS" /D "LASSO_DEBUG" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "_DEBUG"
diff --git a/win32/msvc/php/php.dsp b/win32/msvc/php/php.dsp
index cac36af6..cd6cd4c8 100644
--- a/win32/msvc/php/php.dsp
+++ b/win32/msvc/php/php.dsp
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /debug /machine:I386 /out:"Debug\php_lasso.dll" /pdbtype:sept /libpath:"G:\php\php-4.3.10-Win32" /libpath:"..\Release" /libpath:"h:\lasso-deps\lib"
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /debug /machine:I386 /out:"Debug\php_lasso.dll" /pdbtype:sept /libpath:"G:\php\php-4.3.10-Win32" /libpath:"..\Debug" /libpath:"h:\lasso-deps\lib"
!ENDIF