diff options
| author | Werner Koch <[email protected]> | 2010-11-15 08:40:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-11-15 08:40:30 +0000 |
| commit | eef49ef4171011dec88156481cc70ee350cbbc92 (patch) | |
| tree | 02356d813f53b27e4102cd22b6f99575b2b0bed0 /contrib | |
| parent | More changes for W32CE with MSC. (diff) | |
| download | gpgme-eef49ef4171011dec88156481cc70ee350cbbc92.tar.gz gpgme-eef49ef4171011dec88156481cc70ee350cbbc92.zip | |
Fixes for the MSC build
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 6 | ||||
| -rwxr-xr-x | contrib/conf-w32ce-msc/build.mk | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 40e528a7..1ed8d522 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2010-11-15 Werner Koch <[email protected]> + + * conf-w32ce-msc/build.mk (copy-static-source): Create stdint.h. + (all): Add ws2.lib + (clean): New. + 2010-11-04 Werner Koch <[email protected]> * conf-w32ce-msc/build.mk (copy-built-source): Revert last diff --git a/contrib/conf-w32ce-msc/build.mk b/contrib/conf-w32ce-msc/build.mk index 74e7ff74..72b683af 100755 --- a/contrib/conf-w32ce-msc/build.mk +++ b/contrib/conf-w32ce-msc/build.mk @@ -209,6 +209,7 @@ built_sources = \ gpgme.h \ status-table.h +my_stdint = $(targetsrc)/libassuan/src/stdint.h copy-static-source: @if [ ! -f ./gpgme.c ]; then \ @@ -218,6 +219,14 @@ copy-static-source: cp -t $(targetsrc)/gpgme/src $(sources); cd ../contrib/conf-w32ce-msc ; \ cp -t $(targetsrc)/gpgme/src $(conf_sources) + @echo typedef unsigned long long uint64_t; >$(my_stdint) + @echo typedef long long int64_t; >>$(my_stdint) + @echo typedef unsigned int uint32_t; >>$(my_stdint) + @echo typedef int int32_t; >>$(my_stdint) + @echo typedef unsigned short uint16_t; >>$(my_stdint) + @echo typedef short int16_t; >>$(my_stdint) + @echo typedef unsigned int uintptr_t; >>$(my_stdint) + @echo typedef int intptr_t; >>$(my_stdint) copy-built-source: @if [ ! -f ./gpgme.h ]; then \ @@ -242,7 +251,7 @@ all: $(sources) $(conf_sources) $(built_sources) $(objs) $(libdir)/libgpg-error-0-msc.lib \ $(libdir)/libassuan-0-msc.lib \ coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib \ - commctrl.lib /subsystem:windowsce,5.02 + commctrl.lib ws2.lib /subsystem:windowsce,5.02 # Note that we don't need to create the install directories because # libgpg-error must have been build and installed prior to this @@ -251,3 +260,8 @@ install: all copy /y gpgme.h $(incdir:/=\) copy /y libgpgme-11-msc.dll $(bindir:/=\) copy /y libgpgme-11-msc.lib $(libdir:/=\) + + +clean: + del *.obj libgpgme-11-msc.lib libgpgme-11-msc.dll libgpgme-11-msc.exp + |