aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2010-11-15 15:01:17 +0000
committerMarcus Brinkmann <[email protected]>2010-11-15 15:01:17 +0000
commit5164bd8678dba3c3f2173e976a51b9d16a04f5fa (patch)
tree152205c8afbf5ebd0b0819260e2b401080e3e504
parentFixes for the MSC build (diff)
downloadgpgme-5164bd8678dba3c3f2173e976a51b9d16a04f5fa.tar.gz
gpgme-5164bd8678dba3c3f2173e976a51b9d16a04f5fa.zip
2010-11-15 Marcus Brinkmann <[email protected]>
* conf-w32ce-msc/stdint.h: New file. * conf-w32ce-msc/build.mk (conf_sources): Add stdint.h. * conf-w32ce-msc/build.mk (copy-static-source): Revert last change.
-rw-r--r--contrib/ChangeLog6
-rwxr-xr-xcontrib/conf-w32ce-msc/build.mk13
-rwxr-xr-xcontrib/conf-w32ce-msc/stdint.h9
3 files changed, 17 insertions, 11 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 1ed8d522..87cc8a39 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15 Marcus Brinkmann <[email protected]>
+
+ * conf-w32ce-msc/stdint.h: New file.
+ * conf-w32ce-msc/build.mk (conf_sources): Add stdint.h.
+ * conf-w32ce-msc/build.mk (copy-static-source): Revert last change.
+
2010-11-15 Werner Koch <[email protected]>
* conf-w32ce-msc/build.mk (copy-static-source): Create stdint.h.
diff --git a/contrib/conf-w32ce-msc/build.mk b/contrib/conf-w32ce-msc/build.mk
index 72b683af..966b1c86 100755
--- a/contrib/conf-w32ce-msc/build.mk
+++ b/contrib/conf-w32ce-msc/build.mk
@@ -202,15 +202,14 @@ objs = \
# Sources files in this directory inclduing this Makefile
conf_sources = \
build.mk \
- config.h
+ config.h \
+ stdint.h
# Source files built by running the standard build system.
built_sources = \
gpgme.h \
status-table.h
-my_stdint = $(targetsrc)/libassuan/src/stdint.h
-
copy-static-source:
@if [ ! -f ./gpgme.c ]; then \
echo "Please cd to the src/ directory first"; \
@@ -219,14 +218,6 @@ 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 \
diff --git a/contrib/conf-w32ce-msc/stdint.h b/contrib/conf-w32ce-msc/stdint.h
new file mode 100755
index 00000000..0a821b75
--- /dev/null
+++ b/contrib/conf-w32ce-msc/stdint.h
@@ -0,0 +1,9 @@
+typedef unsigned long long uint64_t;
+typedef long long int64_t;
+typedef unsigned int uint32_t;
+typedef int int32_t;
+typedef unsigned short uint16_t;
+typedef short int16_t;
+typedef unsigned int uintptr_t;
+typedef int intptr_t;
+