MINGW32VERSION=2.95
# If building DLL, the version
-WXVERSION=23_1
+WXVERSION=232
+
+ifndef UNICODE
+ UNICODE=0
+endif
# 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
# Don't make this too long (e.g. by adding contrib/include/wx) because it will
# truncate the command line
-RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+RESFLAGS=--use-temp-file $(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
# Needed to build a DLL if your linker does not support --shared option.
AS = $(CROSS)as
########################## Directories ###############################
+OLELIBS=-lole32 -loleaut32 -luuid
WINLIBS=-lstdc++ -lgcc \
-lwinspool -lwinmm -lshell32 \
-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
- -lole32 -loleaut32 -luuid \
- -lodbc32 -lwsock32 -lopengl32 -lglu32 # -loldnames
+ -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) # -loldnames
#WINLIBS=-lstdc++ -lgcc \
# -lwinspool -lwinmm -lshell32 \
#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$(WXDIR)/lib/msw$(INCEXT) -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"
# 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)
# OBJDIR = objects$(GUISUFFIX)
OBJDIR = .
+ifeq ($(UNICODE),1)
+ UNIEXT=u
+else
+ UNIEXT=
+endif
+
+ifeq ($(WXMAKINGDLL)$(WXUSINGDLL),)
+ INCEXT=$(UNIEXT)
+else
+ INCEXT=dll$(UNIEXT)
+endif
+
ifdef WXMAKINGDLL
EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
- WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
+ WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
endif
ifdef WXUSINGDLL
EXTRADLLFLAGS = -DWXUSINGDLL=1
- WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
+ WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
endif