dbus/cmake CMakeLists.txt,1.2,1.3 config.h.cmake,1.1,1.2

[Ralf Habacker]

Update of /cvs/dbus/dbus/cmake
In directory kemper:/tmp/cvs-serv28209/cmake

Modified Files:
	CMakeLists.txt config.h.cmake 
Log Message:
* cmake/CMakeList.txt,cmake/config.h.cmake: used DBUS_WIN for all win32 systems and DBUS_WINXX for specific subsystems.

Index: CMakeLists.txt
===================================================================
RCS file: /cvs/dbus/dbus/cmake/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CMakeLists.txt	6 Mar 2007 20:51:02 -0000	1.2
+++ CMakeLists.txt	8 Mar 2007 20:10:09 -0000	1.3
@@ -93,7 +93,8 @@
 	include_directories(${wcelibcex}/include/wcelibcex ${wcelibcex}/src)
 	
 	add_definitions(
-			-DDBUS_WINCE
+# see config.h.cmake
+#			-DDBUS_WINCE
 			-DWINCE
 			-DWIN32_PLATFORM_PSPC
 			-D_WINDOWS

Index: config.h.cmake
===================================================================
RCS file: /cvs/dbus/dbus/cmake/config.h.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.h.cmake	3 Mar 2007 14:32:17 -0000	1.1
+++ config.h.cmake	8 Mar 2007 20:10:09 -0000	1.2
@@ -117,9 +117,25 @@
 /* Define to 1 if you have struct cmsgred */
 #cmakedefine    HAVE_CMSGCRED 1
 
-#if defined(_WIN32) || defined(_WIN64)
+// system type defines
+#if defined(_WIN32) || defined(_WIN64) || defined(_WINCE)
 # define DBUS_WIN
 # define DBUS_WIN_FIXME 1
+#endif
+
+#if defined(_WIN32)
+# define DBUS_WIN32
+#endif
+
+#if defined(_WIN64)
+# define DBUS_WIN64
+#endif
+
+#if defined(_WINCE)
+# define DBUS_WINCE
+#endif
+
+#if defined(_WIN32) || defined(_WIN64)
 // mingw mode_t
 # ifdef HAVE_STDIO_H
 #  include <stdio.h>
@@ -138,6 +154,7 @@
 # endif
 #endif	// defined(_WIN32) || defined(_WIN64)
 
+
 #ifdef interface
 #undef interface
 #endif