From 176a614899a7df0785c477fe1cc8df8fd25aa5df Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 6 Nov 2005 20:52:26 +0000 Subject: [PATCH] First draft for WCE PortSDK support. Once again! It's *draft* which requires more work, i.e. more modifications are due... --- INSTALL.WCE | 79 ++++++++++++++++++++++++++++++------------------ e_os.h | 4 ++- util/pl/VC-32.pl | 12 ++++++-- 3 files changed, 62 insertions(+), 33 deletions(-) diff --git a/INSTALL.WCE b/INSTALL.WCE index adc03f41d4..d78c61afa8 100644 --- a/INSTALL.WCE +++ b/INSTALL.WCE @@ -4,27 +4,36 @@ Building OpenSSL for Windows CE requires the following external tools: - * Microsoft eMbedded Visual C++ 3.0 - * wcecompat compatibility library (www.essemer.com.au) - * Optionally ceutils for running automated tests (www.essemer.com.au) - - You also need Perl for Win32. You will need ActiveState Perl, available - from http://www.activestate.com/ActivePerl. - - Windows CE support in OpenSSL relies on wcecompat and therefore it's - appropriate to check http://www.essemer.com.au/windowsce/ for updates in - case of compilation problems. As for the moment of this writing version - 1.1 is available and actually required for WCE 4.2 and newer platforms. - All Windows CE specific issues should be directed to www.essemer.com.au. - - The C Runtime Library implementation for Windows CE that is included with - Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places - incorrect. wcecompat plugs the holes and tries to bring the Windows CE - CRT to a level that is more compatible with ANSI C. wcecompat goes further - and provides low-level IO and stream IO support for stdin/stdout/stderr - (which Windows CE does not provide). This IO functionality is not needed - by the OpenSSL library itself but is used for the tests and openssl.exe. - More information is available at www.essemer.com.au. + * Microsoft eMbedded Visual C++ 3.0 or later + * Appropriate SDK might be required + * Perl for Win32 [commonly recommended ActiveState Perl is available + from http://www.activestate.com/Products/ActivePerl/] + + * wcecompat compatibility library available at + http://www.essemer.com.au/windowsce/ + * Optionally ceutils for running automated tests (same location) + + _or_ + + * PocketConsole driver and PortSDK available at + http://www.symbolictools.de/public/pocketconsole/ + * CMD command interpreter (same location) + + As Windows CE support in OpenSSL relies on 3rd party compatibility + library, it's appropriate to check corresponding URL for updates. For + example if you choose wcecompat, note that as for the moment of this + writing version 1.2 is available and actually required for WCE 4.2 + and newer platforms. All wcecompat issues should be directed to + www.essemer.com.au. + + Why compatibility library at all? The C Runtime Library implementation + for Windows CE that is included with Microsoft eMbedded Visual C++ is + incomplete and in some places incorrect. Compatibility library plugs + the holes and tries to bring the Windows CE CRT to [more] usable level. + Most gaping hole in CRT is support for stdin/stdout/stderr IO, which + proposed compatibility libraries solve in two different ways: wcecompat + redirects IO to active sync link, while PortSDK - to NT-like console + driver on the handheld itself. Building -------- @@ -34,9 +43,21 @@ > "C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN\WCEARM.BAT" - Next indicate where wcecompat is located: + Next pick compatibility library according to your preferences. - > set WCECOMPAT=C:\wcecompat + 1. To choose wcecompat set up WCECOMPAT environment variable pointing + at the location of wcecompat tree "root": + + > set WCECOMPAT=C:\wcecompat + > set PORTSDK_LIBPATH= + + 2. To choose PortSDK set up PORTSDK_LIBPATH to point at hardware- + specific location where your portlib.lib is installed: + + > set PORTSDK_LIBPATH=C:\PortSDK\lib\ARM + > set WCECOMPAT= + + Note that you may not set both variables. Next you should run Configure: @@ -52,16 +73,16 @@ Then from the VC++ environment at a prompt do: - - to build static libraries: + > nmake -f ms\cedll.mak - > nmake -f ms\ce.mak + [note that static builds are not supported under CE] - - or to build DLLs: + If all is well it should compile and you will have some DLLs and executables + in out32dll*. - > nmake -f ms\cedll.mak + <<< everyting below needs revision in respect to wcecompat vs. PortSDK >>> - If all is well it should compile and you will have some static libraries and - executables in out32, or some DLLs and executables in out32dll. If you want + If you want to try the tests then make sure the ceutils are in the path and do: > cd out32 diff --git a/e_os.h b/e_os.h index d064525ee0..5019e21bb2 100644 --- a/e_os.h +++ b/e_os.h @@ -283,7 +283,9 @@ static unsigned int _strlen31(const char *str) # ifdef OPENSSL_SYS_WINCE # define OPENSSL_NO_POSIX_IO -# include +# if defined(_WIN32_WCE) && _WIN32_WCE<410 +# include +# endif # endif # define ssize_t long diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 4b489bfc7a..d159f0f63e 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -79,8 +79,10 @@ 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 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT'; $base_cflags.=" $wcecdefs"; + $base_cflags.=' $(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'})); + $base_cflags.=' $(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'})); $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; $lflags="/nologo /opt:ref $wcelflag"; @@ -124,7 +126,8 @@ else { $ex_libs='wsock32.lib'; } if ($FLAVOR =~ /CE/) { - $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib'; + $ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib' if (defined($ENV{'WCECOMPAT'})); + $ex_libs.=' $(PORTSDK_LIBPATH)/portlib.lib' if (defined($ENV{'PORTSDK_LIBPATH'})); $ex_libs.=' /nodefaultlib:oldnames.lib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86"); } else @@ -225,6 +228,7 @@ ___ elsif ($shlib && $FLAVOR =~ /CE/) { $mlflags.=" $lflags /dll"; + $lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'})); $lib_cflag=" -D_WINDLL -D_DLL"; $out_def='out32dll_$(TARGETCPU)'; $tmp_def='tmp32dll_$(TARGETCPU)'; @@ -259,7 +263,9 @@ sub do_lib_rule {} elsif ($FLAVOR =~ /CE/) { - $ex.=' winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib'; + $ex.=' winsock.lib'; + $ex.=' $(WCECOMPAT)/lib/wcecompatex.lib' if (defined($ENV{'WCECOMPAT'})); + $ex.=' $(PORTSDK_LIBPATH)/portlib.lib' if (defined($ENV{'PORTSDK_LIBPATH'})); } else { -- 2.34.1