X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/741258ea5a5ab8ee810ad84762ffb5874bc95c6c..59d04dff037f66e9e73b389de72835211f5f0bcd:/src/makeg95.env?ds=inline diff --git a/src/makeg95.env b/src/makeg95.env index 4ecb310617..f896f4ef18 100644 --- 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 "-mthreads" if you want to have threads under mingw32 +COMMON_THREADFLAGS = + # Debugging information ifeq ($(FINAL),0) DEBUGFLAGS = -g -D__WXDEBUG__ @@ -270,12 +273,12 @@ endif # 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 -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