README.win32: Note about fixing another bug in the mingw32 headers.

makefile.msc.in: Turn on debugging with nmake variable.

diff --git a/README.win32 b/README.win32
index c741a79..710430e 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -114,10 +114,13 @@ in crtdll.dll), and defines __MSVCRT__.
 --Di386 -D_WIN32   -DWINNT  -D_X86_=1 -D__STDC__=1  -D__stdcall=__attribute__((__stdcall__))   -D__cdecl=__attribute__((__cdecl__))   -D__declspec(x)=__attribute__((x))   -Asystem(winnt) -Acpu(i386) -Amachine(i386)
 +-Di386 -D_WIN32 %{mno-cygwin:-D__MSVCRT__ } -DWINNT  -D_X86_=1 -D__STDC__=1  -D__stdcall=__attribute__((__stdcall__))   -D__cdecl=__attribute__((__cdecl__))   -D__declspec(x)=__attribute__((x))   -Asystem(winnt) -Acpu(i386) -Amachine(i386) 
 
-You should also fix the definition of _dev_t in the header
-mingw32/sys/types.h to correspond to what type actually is used by
-msvcrt.dll. It should be unsigned int, not short. Otherwise stat()
-calls will fail.
+You should also fix two bugs in the mingw32 headers: The type of
+_dev_t in the header mingw32/sys/types.h should be unsigned int, not
+short. The type for st_uid in sys/stat.h to be short, not int. This is
+what the Microsoft's headers and runtime library use. Otherwise
+accessing the fields in a stat struct as filled in by the stat and
+fstat functions in the MS library will cause various interesting
+failures.
 
 You also will have to get the mingw32 source snapshot from
 http://www.geocities.com/Tokyo/Towers/6162/mingw32_980701_tar.gz (this

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 61b1e43..4a1e683 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -12,20 +12,25 @@ PTHREADS = ..\pthreads-snap-1999-05-30
 PTHREAD_LIB = $(PTHREADS)\pthread.lib
 PTHREAD_INC = -I $(PTHREADS)
 
+!IFNDEF DEBUG
 # Full optimization:
-OPTIMIZE = -Ox
+OPTIMIZE = -Ox -MD
+LINKDEBUG =
+!ELSE
 # Debugging:
-#OPTIMIZE = -Zi
+OPTIMIZE = -Zi -MDd
+LINKDEBUG = /debug
+!ENDIF
 
 ################################################################
 
 # Nothing much configurable below
 
 # cl -? describes the options
-CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -nologo
+CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
 
 # No general LDFLAGS needed
-LDFLAGS = /link # /debug
+LDFLAGS = /link $(LINKDEBUG)
 INSTALL = copy
 
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@

diff --git a/makefile.msc.in b/makefile.msc.in
index 61b1e43..4a1e683 100644 (file)
--- a/makefile.msc.in
+++ b/makefile.msc.in
@@ -12,20 +12,25 @@ PTHREADS = ..\pthreads-snap-1999-05-30
 PTHREAD_LIB = $(PTHREADS)\pthread.lib
 PTHREAD_INC = -I $(PTHREADS)
 
+!IFNDEF DEBUG
 # Full optimization:
-OPTIMIZE = -Ox
+OPTIMIZE = -Ox -MD
+LINKDEBUG =
+!ELSE
 # Debugging:
-#OPTIMIZE = -Zi
+OPTIMIZE = -Zi -MDd
+LINKDEBUG = /debug
+!ENDIF
 
 ################################################################
 
 # Nothing much configurable below
 
 # cl -? describes the options
-CC = cl -G5 -GF $(OPTIMIZE) -W3 -MD -nologo
+CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
 
 # No general LDFLAGS needed
-LDFLAGS = /link # /debug
+LDFLAGS = /link $(LINKDEBUG)
 INSTALL = copy
 
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@