[Pcsclite-cvs-commit] CVS PKCS11/win32

[CVS User rousseau]

Update of /cvsroot/muscleapps/PKCS11/win32
In directory haydn:/tmp/cvs-serv12523

Modified Files:
	PKCS11.dsp 
Log Message:
- removed libeay32.lib (not necessary)
- added advapi32.lib (for registry based config file)
- dlls and libs now copied to win32bin\Debug and win32bin\Release
- on release build
   - base address set to 0x66300000
     - the addr is arbitary but having a fix base addr can easy
       locating of offending module
   - set compiler optimization to Minimize Size to speed up a bit

Thanks to Martin Leung for the patch


--- /cvsroot/muscleapps/PKCS11/win32/PKCS11.dsp	2002/06/27 22:34:44	1.5
+++ /cvsroot/muscleapps/PKCS11/win32/PKCS11.dsp	2005/07/25 10:34:11	1.6
@@ -43,7 +43,7 @@
 # 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 "PKCS11_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PKCS11_EXPORTS" /D "CRYPTOKI_EXPORTS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Zi /O1 /I "..\include" /I "..\..\..\pcsclite\PCSC\libmusclecard\src\PCSC" /I "..\..\..\pcsclite\PCSC\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PKCS11_EXPORTS" /D "CRYPTOKI_EXPORTS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,7 +54,11 @@
 # 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 /machine:I386
-# ADD LINK32 musclecard.lib libeay32.lib pthreadVC.lib /nologo /dll /machine:I386
+# ADD LINK32 musclecard.lib pthreadVC.lib advapi32.lib /nologo /base:"0x66300000" /dll /debug /machine:I386 /libpath:"..\..\..\libs"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=if not exist ..\..\win32bin\*.* mkdir ..\..\win32bin	if not exist ..\..\win32bin\Release\*.* mkdir ..\..\win32bin\Release	copy  Release\PKCS11.dll  ..\..\win32bin\Release	copy  Release\PKCS11.lib  ..\..\win32bin\Release
+# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "PKCS11 - Win32 Debug"
 
@@ -70,7 +74,7 @@
 # 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 "PKCS11_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PKCS11_EXPORTS" /D "CRYPTOKI_EXPORTS" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\..\pcsclite\PCSC\libmusclecard\src\PCSC" /I "..\..\..\pcsclite\PCSC\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PKCS11_EXPORTS" /D "CRYPTOKI_EXPORTS" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -81,10 +85,10 @@
 # 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 musclecard.lib libeay32.lib pthreadVC.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 musclecard.lib pthreadVC.lib advapi32.lib /nologo /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy   Debug\PKCS11.dll  ..\..\win32bin 	copy   Debug\PKCS11.lib  ..\..\win32bin 	copy  Debug\PKCS11.dll  "C:\Program Files\Muscle\Runtime\"
+PostBuild_Cmds=if not exist ..\..\win32bin\*.* mkdir ..\..\win32bin	if not exist ..\..\win32bin\Debug\*.* mkdir ..\..\win32bin\Debug	copy   Debug\PKCS11.dll  ..\..\win32bin\Debug	copy   Debug\PKCS11.lib  ..\..\win32bin\Debug
 # End Special Build Tool
 
 !ENDIF 
@@ -98,7 +102,20 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=..\src\crackcert.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\p11_crypt.c
+
+!IF  "$(CFG)" == "PKCS11 - Win32 Release"
+
+# ADD CPP /I "..\..\..\pcsclite\libmusclecard\src\PCSC"
+
+!ELSEIF  "$(CFG)" == "PKCS11 - Win32 Debug"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -196,12 +213,20 @@
 
 SOURCE=..\src\p11x_win32dll.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\..\pcsclite\PCSC\src\thread_win32.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=..\include\crackcert.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\cryptoki.h
 # End Source File
 # Begin Source File