X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0af5538d676fdc5f7620233ee24f43832b80bff..625cb8c0b1ac12f26265cae2c69d7f510de0edb1:/src/makeg95.env diff --git a/src/makeg95.env b/src/makeg95.env index dcb14319bb..ed56b11fee 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -18,7 +18,7 @@ MINGW32=1 MINGW32VERSION=2.95 # If building DLL, the version -WXVERSION=23_1 +WXVERSION=23_2 # Say yes if you have a "modern" linker that supports --shared option. # Note that you're probably going to wait forever for dlltool/gcc/etc @@ -178,7 +178,7 @@ endif #ifeq ($(MINGW32),1) #INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) #else -INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 +INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 #endif RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include" @@ -187,7 +187,7 @@ ifdef WXUSINGDLL # png, jpeg, etc are exported from wx dll, so skip and save on link time. LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) else - LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS) + LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS) endif WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)