[svn] assuan - r397 - in trunk/contrib: . conf-w32ce-msc

[svn author wk]

Author: wk
Date: 2010-11-15 08:28:58 +0100 (Mon, 15 Nov 2010)
New Revision: 397

Modified:
   trunk/contrib/ChangeLog
   trunk/contrib/conf-w32ce-msc/build.mk
Log:
Fixes for the MSC build


Modified: trunk/contrib/ChangeLog
===================================================================
--- trunk/contrib/ChangeLog	2010-11-15 06:54:15 UTC (rev 396)
+++ trunk/contrib/ChangeLog	2010-11-15 07:28:58 UTC (rev 397)
@@ -1,3 +1,9 @@
+2010-11-15  Werner Koch  <wk at g10code.com>
+
+	* conf-w32ce-msc/build.mk (copy-static-source): Create stdint.h.
+	(all): Add ws2.lib
+	(clean): New.
+
 2010-11-02  Werner Koch  <wk at g10code.com>
 
 	* conf-w32ce-msc/build.mk: Change directory layout.

Modified: trunk/contrib/conf-w32ce-msc/build.mk
===================================================================
--- trunk/contrib/conf-w32ce-msc/build.mk	2010-11-15 06:54:15 UTC (rev 396)
+++ trunk/contrib/conf-w32ce-msc/build.mk	2010-11-15 07:28:58 UTC (rev 397)
@@ -122,6 +122,8 @@
 built_sources = \
 	assuan.h
 
+my_stdint = $(targetsrc)/libassuan/src/stdint.h
+
 copy-static-source:
 	@if [ ! -f ./assuan-defs.h ]; then \
            echo "Please cd to the src/ directory first"; \
@@ -130,6 +132,14 @@
 	cp -t $(targetsrc)/libassuan/src $(sources);
 	cd ../contrib/conf-w32ce-msc ; \
            cp -t $(targetsrc)/libassuan/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:
@@ -152,7 +162,7 @@
 		/NODEFAULTLIB:"oldnames.lib" /DYNAMICBASE:NO \
 	        $(objs) $(libdir)/libgpg-error-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
@@ -161,3 +171,7 @@
 	copy /y libassuan-0-msc.dll $(bindir:/=\)
 	copy /y libassuan-0-msc.lib $(libdir:/=\)
 	copy /y assuan.h $(incdir:/=\)
+
+clean:
+	del *.obj libassuan-0-msc.lib libassuan-0-msc.dll libassuan-0-msc.exp
+