fixed the width of the (week day as number) field, should be 1, not 2

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 4ecb310617f8b824fa27c7645d4410b8f19e200b..f896f4ef1877cba5a8583f62608cf44514f3015f 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -116,6 +116,9 @@ DLLTOOL = dlltool
 # add "-DHAVE_W32API_H" if you have w32api >= 0.5
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # add "-DHAVE_W32API_H" if you have w32api >= 0.5
 OPTIONS = -DSTRICT # -D__MINGW32__
 

+# Add "-mthreads" if you want to have threads under mingw32
+COMMON_THREADFLAGS =
+

 # Debugging information
 ifeq ($(FINAL),0)
   DEBUGFLAGS = -g -D__WXDEBUG__
 # Debugging information
 ifeq ($(FINAL),0)
   DEBUGFLAGS = -g -D__WXDEBUG__


@@ -270,12 +273,12 @@ endif
 
 
 # You shouldn't need to change these...
 
 
 # You shouldn't need to change these...

-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) $(EXTRADLLFLAGS)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS) -DWIN32_LEAN_AND_MEAN
+CPPFLAGS = $(XINCLUDE) $(INC) $(COMMON_THREADFLAGS) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) $(EXTRADLLFLAGS)
+CFLAGS = $(XINCLUDE) $(INC) $(COMMON_THREADFLAGS) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS) -DWIN32_LEAN_AND_MEAN

 ifeq ($(wxUSE_GUI),1)
     WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
 endif
 ifeq ($(wxUSE_GUI),1)
     WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
 endif

-LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
+LDFLAGS = $(WINDOWSLDFLAGS) $(COMMON_THREADFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)

 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c
 
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c