diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-12-03 14:20:44 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-12-03 14:20:44 +0000 |
| commit | 7a1f92fdc39c5840cb8f491fa59a6ae5b9b5f610 (patch) | |
| tree | 43e87cd1c6d73fdc59d70f3b2e4a75fc7cb2f5f2 /util | |
| parent | e7a285694ee5213c26d5d1216fa04724a82f3da5 (diff) | |
Windows CE updates, contributed by Steven Reddie <smr@essemer.com.au>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 11 | ||||
| -rw-r--r-- | util/pl/VC-CE.pl | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 18ef2f5708..8c6370bc5d 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -273,6 +273,17 @@ $defs= <<"EOF"; # The one monster makefile better suits building in non-unix # environments. +EOF + +if ($platform eq "VC-CE") + { + $defs.= <<"EOF"; +!INCLUDE <\$(WCECOMPAT)/wcedefs.mak> + +EOF + } + +$defs.= <<"EOF"; INSTALLTOP=$INSTALLTOP # Set your compiler options diff --git a/util/pl/VC-CE.pl b/util/pl/VC-CE.pl index 907495efe4..1805ef9d97 100644 --- a/util/pl/VC-CE.pl +++ b/util/pl/VC-CE.pl @@ -12,8 +12,8 @@ $rm='del'; # C compiler stuff $cc='$(CC)'; -$cflags=' /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -D$(TARGETCPU) -D_$(TARGETCPU)_ -DUNDER_CE=300 -D_WIN32_CE=300 -DWIN32_PLATFORM_PSPC -DUNICODE -D_UNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include'; -$lflags='/nologo /subsystem:windowsce,3.00 /machine:$(TARGETCPU) /opt:ref'; +$cflags=' /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(WCETARGETDEFS) -DUNICODE -D_UNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include'; +$lflags='/nologo /subsystem:windowsce,$(WCELDVERSION) /machine:$(WCELDMACHINE) /opt:ref'; $mlflags=''; $out_def='out32_$(TARGETCPU)'; @@ -36,8 +36,7 @@ $efile="/out:"; $exep='.exe'; if ($no_sock) { $ex_libs=""; } -else { $ex_libs='winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib'; } -#else { $ex_libs='winsock.lib coredll.lib $(WCECOMPAT)/lib/wcecompatex.lib'; } +else { $ex_libs='winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib $(WCELDFLAGS)'; } # static library stuff $mklib='lib'; |