Commit Graph

28 Commits

Author SHA1 Message Date
alonbl f9347111db Support OPENSC_FEATURES for MSC build
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3465 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-07 21:28:37 +00:00
alonbl 54c1c735f3 Attached are the latest mode to OpenSC svn 3462 to use the Makefile.mak
files to build on Windows.

I got rutoken to compile, and took out the #ifdef's I had in last week.
The rutoken programmer declared some variables in the middle of a block
rather then having all the declare statements at the beginning of a block
as is normally done in C. The Microsoft compile treats this as an error.
(Actual many errors.)

The makedef.pl is no longer needed, as the exports files can be used.
Note that in the original Makefile.mak files only opensc.def and
pkcs15init.def were created.

winconfig.h has a number of changes. As discussed last week this could
be created by autoconf. I also noted that the Active State Perl that
was required for the makedef.pl has a psed command that could be used
like sed to update winconfig.h.  I did not attempt to do this.



  win32/Make.rules.mak - Use ENABLE_OPENSSL and ENABLE_ZLIB

  src/tools/Makefile.mak - add the rutoken.tool.exe

  src/tools/eidenv.c - use PACKAGE_VERSION

  src/pkcs11/Makefile.mak - reorder the objest to match the list in the
           Makefile.am. Makes it easier to read.

  src/include/winconfig.h - The windows version of the config.h
           Changes based on discussions on the list last week.

  src/common/Makefile.mak - renamed modules.

  src/pkcs15init/Makefile.mak - reordered, and added back the rutoken modules
           replaced the use of makdef.pl to sue the exports file.

  src/scconf/Makefile.mak - reordered objects.

  src/libopensc/card-rutoken.c -
           error. Moved the declares to the beginning of blocks.

  src/libopensc/Makefile.mak - reorder names, and add rutoken.
           Use the libopensc.exports file.

  src/libopensc/pkcs15-prkey-rutoken.c - more moving of declare statements.

By Douglas E. Engert

http://www.opensc-project.org/pipermail/opensc-devel/2008-April/011011.html



git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3464 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-07 19:42:43 +00:00
aj 26e2e5477f update version info for windows.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3255 c6295689-39f2-0310-b995-f0e70906c6a9
2007-08-20 20:20:35 +00:00
aj be022c16d3 fix version numbers preparing for next release.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3197 c6295689-39f2-0310-b995-f0e70906c6a9
2007-07-03 14:15:15 +00:00
nils 42ad6be451 win build fixes; patch supplied by Douglas E. Engert <deengert@anl.gov>
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3003 c6295689-39f2-0310-b995-f0e70906c6a9
2006-08-02 19:31:34 +00:00
aj f7110c593b oops, we forgot to update the version. fix that for opensc 0.11.1.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2942 c6295689-39f2-0310-b995-f0e70906c6a9
2006-05-09 19:39:33 +00:00
martin 9213a29a34 Small fixes for windows compilation (Visual Studio Express 2005)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2855 c6295689-39f2-0310-b995-f0e70906c6a9
2006-02-23 11:02:24 +00:00
aj 8b65da70a1 prepare 0.10.0 release.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2652 c6295689-39f2-0310-b995-f0e70906c6a9
2005-10-21 17:34:09 +00:00
aj 54ac27bd40 remove winreg.h as global include (not needed in 99.9% of all files),
remove obsolete config file / profile dir definitions.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2269 c6295689-39f2-0310-b995-f0e70906c6a9
2005-03-23 22:58:49 +00:00
aet 8c9895c896 - Add support for getting location of the configuration
file from Windows registry (HKCU/HKLM)
- Handle OPENSC_CONF environment variable on unix
- Add configuration option "profile_dir" to bypass
  build time setting for pkcs15 initialization profiles
  directory

Patch by Andreas Jellinghaus, with minor enhancements
from me.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2231 c6295689-39f2-0310-b995-f0e70906c6a9
2005-03-07 14:00:31 +00:00
sth b59fb4597e Have the option add a delay before resending an APDU (after a 6CXX response). Is needed for most current belpic cards on fast readers
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2117 c6295689-39f2-0310-b995-f0e70906c6a9
2005-01-30 19:20:38 +00:00
aet bd45a8aef1 - Update version for win32 build
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2017 c6295689-39f2-0310-b995-f0e70906c6a9
2004-12-15 15:42:27 +00:00
sth 5bbe78a8fe sleep(sec) = Sleep(1000 * ms) on Windows
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1687 c6295689-39f2-0310-b995-f0e70906c6a9
2003-12-19 06:52:38 +00:00
aet 671adbeb55 Rename HAVE_PCSCLITE to HAVE_PCSC, which is more correct.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1470 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-26 08:15:15 +00:00
aet 886409a5f6 Updates for the 0.8.1 release.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1447 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-17 18:43:45 +00:00
sth 1a36f46a5d First include <stdio.h>, otherwise the #include <windows.h> turns wchar_t into an (unsigned) short (Unicode)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1439 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-11 06:02:43 +00:00
aet 597877eb49 Move #include <windows.h> to winconfig.h in
order to minimize win32 specific code sections.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1411 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-03 18:18:57 +00:00
aet 5616dba08e - Stop using unflexible automake conditionals when
building PC/SC, OpenCT or USBToken support,
  use ifdef's directly in source.
- Because of above, add HAVE_PCSCLITE for winconfig.h
- Remove unnecessary includes for log.h, opensc.h and
  errors.h in libopensc sources, they're already taken
  care by internal.h.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1406 c6295689-39f2-0310-b995-f0e70906c6a9
2003-09-03 09:28:55 +00:00
sth 9dd994fb2c Little fix for Windows
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1275 c6295689-39f2-0310-b995-f0e70906c6a9
2003-07-17 15:09:01 +00:00
sth 82c00d806c Placing #include <windows.h> in wincofig.h causes compiler problems, better put it in each file that uses _MAX_PATH
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1234 c6295689-39f2-0310-b995-f0e70906c6a9
2003-06-27 12:59:22 +00:00
sth 0cb9a18963 Some Windows fixes
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1233 c6295689-39f2-0310-b995-f0e70906c6a9
2003-06-27 12:32:57 +00:00
sth bb4bdd529d Let sc_profile_locate() behave about the same way under Win32 than under Linux
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1213 c6295689-39f2-0310-b995-f0e70906c6a9
2003-06-18 12:38:27 +00:00
okir 501cdbd7e0 - Get opensc.conf from %windir% rather than hard-coded C:\\WINNT (Stef)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@875 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-20 10:12:28 +00:00
okir 1aa5e6161c - PATH_MAX fix for win32 (Stef)
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@854 c6295689-39f2-0310-b995-f0e70906c6a9
2003-01-09 11:41:04 +00:00
aet 1ddde4e899 - Add access, mkdir and getpass wrappers into winconfig.h
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@806 c6295689-39f2-0310-b995-f0e70906c6a9
2002-12-22 14:43:13 +00:00
fabled 3837299e1e Updated win32 port for recent updates.
Noticed by Stef Hoeben.


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@708 c6295689-39f2-0310-b995-f0e70906c6a9
2002-11-11 08:22:11 +00:00
aet 1d2c9e4c48 Cleanups for initial win32 port, untested.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@696 c6295689-39f2-0310-b995-f0e70906c6a9
2002-10-19 14:04:52 +00:00
fabled 7635468ed9 - Initial support for win32
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@654 c6295689-39f2-0310-b995-f0e70906c6a9
2002-06-14 12:52:56 +00:00