#
# makeg95.env
# Common makefile settings for wxWindows programs
-# This file is included by all the other makefiles, thus changes
+# This file is included by all the other makefiles, thus changes
# made here take effect everywhere (except where overriden).
# The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32.
#
MINGW32VERSION=2.95
# If building DLL, the version
-WXVERSION=23_0
+WXVERSION=23_1
# 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
# Set to the appropriate remove command (must support forward slashes)
# You can get a suitable rm.exe from ports/mingw32/extra.zip on the ftp site.
-RM=rm -f
+RM=rm -f
# Set to the appropriate copy command (must support forward slashes)
# You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site.
########################## 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 \
WXBASESRC=$(WXDIR)/src/common
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
-GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32
+GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32
ifeq ($(MINGW32),1)
ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
#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/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"