From 44b27022588dd2c1fe495e305ea1e26187805619 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 4 Nov 2010 08:16:57 +0000 Subject: More changes for W32CE with MSC. --- contrib/ChangeLog | 5 +++++ contrib/conf-w32ce-msc/build.mk | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index ccee4948..40e528a7 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2010-11-04 Werner Koch + + * conf-w32ce-msc/build.mk (copy-built-source): Revert last + change. Does not work with W32CE where MSC defines it in except.h. + 2010-11-03 Werner Koch * conf-w32ce-msc/build.mk (copy-built-source): Create dummy sehmap.h. diff --git a/contrib/conf-w32ce-msc/build.mk b/contrib/conf-w32ce-msc/build.mk index 70cae832..74e7ff74 100755 --- a/contrib/conf-w32ce-msc/build.mk +++ b/contrib/conf-w32ce-msc/build.mk @@ -219,19 +219,13 @@ copy-static-source: cd ../contrib/conf-w32ce-msc ; \ cp -t $(targetsrc)/gpgme/src $(conf_sources) -# We create a dummy sehmap.h which will be included first due to -I. . -# For some reasons sehmap.h is included by MSC for WindowsCE and -# introduces a macro "leave" which conflicts of our use of "leave" for -# a label (leave and enter are pretty common names for pro- and epilog -# code). copy-built-source: @if [ ! -f ./gpgme.h ]; then \ echo "Please build using ./autogen.sh --build-w32ce first"; \ exit 1; \ fi cp -t $(targetsrc)/gpgme/src $(built_sources) - echo '/* Dummy replacement for useless header. */' \ - > $(targetsrc)/gpgme/src/sehmap.h + echo '/* Dummy io.h header. */' > $(targetsrc)/gpgme/src/io.h copy-source: copy-static-source copy-built-source -- cgit v1.2.3