giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
nils 2006-08-02 19:31:34 +00:00
parent 81fd37e617
commit 42ad6be451
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/Makefile.mak
View File

@ -1,9 +1,9 @@
TOPDIR = ..\..
HEADERS = getopt.h my_getopt.h
HEADERS = my_getopt.h strlcpy.h
HEADERSDIR = $(TOPDIR)\src\include
TARGET = common.lib
OBJECTS = getpass.obj my_getopt.obj
OBJECTS = getpass.obj my_getopt.obj strlcpy.obj
all: install-headers $(TARGET)

3
src/include/winconfig.h
View File

@ -64,7 +64,6 @@
#define F_OK 0 /* test whether exist. */
#endif
#define HAVE_GETOPT_H
#define HAVE_IO_H
#define HAVE_GETPASS
#define HAVE_PCSC
@ -72,7 +71,7 @@
#define PATH_MAX _MAX_PATH
#ifndef VERSION
#define VERSION "0.11.1"
#define VERSION "0.11.2"
#endif
/* src/common/getpass.c */

1
src/libopensc/pkcs15-piv.c
View File

@ -19,6 +19,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "internal.h"
#include <stdlib.h>
#include <string.h>

4
src/pkcs11/Makefile.mak
View File

@ -20,8 +20,8 @@ all: install-headers install-headers-dir $(TARGET) $(TARGET2) $(TARGET3)
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
$(TARGET): $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib
link $(LINKFLAGS) /dll /out:$(TARGET) $(OBJECTS) ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
$(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
$(TARGET2): $(OBJECTS2)
lib /nologo /machine:ix86 /out:$(TARGET2) $(OBJECTS2) $(LIBLTDL_LIB)

2
src/tools/eidenv.c
View File

@ -26,7 +26,7 @@
#include <unistd.h>
#endif
#include <stdlib.h>
#include <getopt.h>
#include <my_getopt.h>
#include <string.h>
#include <opensc/opensc.h>
#include <opensc/asn1.h>

4
src/tools/netkey-tool.c
View File

@ -33,9 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif
#include <my_getopt.h>
#include <string.h>
#include <errno.h>
#include <opensc/opensc.h>

4
src/tools/util.h
View File

@ -16,9 +16,7 @@
#include <unistd.h>
#endif
#include <sys/stat.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#include <my_getopt.h>
#include <opensc/opensc.h>
#ifdef __cplusplus

2
win32/Make.rules.mak
View File

@ -21,7 +21,7 @@ OPENSSL_LIB = C:\openssl\out32dll\libeay32.lib
PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe
!ENDIF
COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc $(OPENSSL_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400 $(OPENSSL_DEF)
COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc /I$(TOPDIR)\src\common $(OPENSSL_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400 $(OPENSSL_DEF)
LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86