Commit 08debe11 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Install fipscanister.o and friends. Disable warning halt in VC++ build.

parent 9c7e0582

fips-1.0/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ install: 
	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \

	done;

	@target=install; $(RECURSIVE_MAKE)

	@cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \

		fips_premain.c.sha1 \

		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \

	chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*



lint:

	@target=lint; $(RECURSIVE_MAKE)

util/pl/VC-32.pl

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ elsif ($FLAVOR =~ /CE/) 
    }



    $cc='$(CC)';

    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';

    $base_cflags=' /W3 /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';

    $base_cflags.=" $wcecdefs";

    $opt_cflags=' /MC /O1i';	# optimize for space, but with intrinsics...

    $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
@@ -105,7 +105,7 @@ elsif ($FLAVOR =~ /CE/) 
    }

else	# Win32

    {

    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';

    $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';

    $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8

    $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';	# shut up VC8

    $opt_cflags=' /MD /Ox /O2 /Ob2';