ooo-build r12345 - in trunk: . src

[tml svn gnome org]

Author: tml
Date: Sat Apr 26 03:20:44 2008
New Revision: 12345
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12345&view=rev

Log:
2008-04-26  Tor Lillqvist  <tml novell com>

	* src/glib-1.2.10-ooo.patch: Update for MSVS9 which is the
	compiler that should be use now for Win32 builds.
	(glib-1.2.10/makefile.msc): Don't use options -G5 and -GD which
	don't exist any more. Use -D_CRT_SECURE_NO_DEPRECATE
	-D_CRT_NONSTDC_NO_DEPRECATE to avoid silly warnings.
	(glib-1.2.10/glib.h): Don't #define the non-ISO names for the
	POSIX functions as the underscore-prefixed ones. It is not needed
	and leads to compiler warnings. The MS headers do have
	declarations for the non-ISO ones.



Modified:
   trunk/ChangeLog
   trunk/src/glib-1.2.10-ooo.patch

Modified: trunk/src/glib-1.2.10-ooo.patch
==============================================================================
--- trunk/src/glib-1.2.10-ooo.patch	(original)
+++ trunk/src/glib-1.2.10-ooo.patch	Sat Apr 26 03:20:44 2008
@@ -1,6 +1,6 @@
 --- glib-1.2.10/makefile.msc	Thu Mar 15 17:48:49 2001
 +++ glib-1.2.10/makefile.msc	Fri Oct 14 12:30:05 2005
-@@ -1,16 +1,13 @@
+@@ -1,23 +1,20 @@
 -## Makefile for building the GLib, gmodule and gthread dlls with Microsoft C
 +## Makefile for building the GLib and gmodule dlls with Microsoft C
  ## Use: nmake -f makefile.msc install
@@ -23,6 +23,14 @@
  
  ################################################################
  
+ # Nothing much configurable below
+ 
+ # cl -? describes the options
+-CC = cl -G5 -GF -Ox -W3 -MD -nologo
++CC = cl -GF -Ox -W3 -MD -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -nologo
+ 
+ # No general LDFLAGS needed
+ LDFLAGS = /link
 @@ -33,17 +30,18 @@
  	glib-$(GLIB_VER).dll	\
  	gmodule\gmoduleconf.h \
@@ -45,6 +53,15 @@
  
  glib_OBJECTS = \
  	garray.obj	\
+@@ -80,7 +80,7 @@
+ 	copy config.h.win32 config.h
+ 
+ .c.obj :
+-	$(CC) $(CFLAGS) -GD -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
++	$(CC) $(CFLAGS) -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
+ 
+ gmodule_OBJECTS = \
+ 	gmodule.obj
 @@ -96,15 +94,6 @@
  gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32
  	copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h
@@ -102,3 +119,24 @@
 +	-del *.mk1
 +	-del *.pdb
 +	-del *.ilk
+--- glib-1.2.10/glib.h
++++ glib-1.2.10/glib.h
+@@ -2635,18 +2635,7 @@
+  * For some functions, we provide emulators in glib, which are prefixed
+  * with gwin_.
+  */
+-#    define getcwd		_getcwd
+-#    define getpid		_getpid
+-#    define access		_access
+-#    define open		_open
+-#    define read		_read
+-#    define write		_write
+-#    define lseek		_lseek
+-#    define close		_close
+ #    define pipe(phandles)	_pipe (phandles, 4096, _O_BINARY)
+-#    define popen		_popen
+-#    define pclose		_pclose
+-#    define fdopen		_fdopen
+ #    define ftruncate(fd, size)	gwin_ftruncate (fd, size)
+ #    define opendir		gwin_opendir
+ #    define readdir		gwin_readdir